diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-01 22:24:36 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-09 13:48:52 +0100 |
commit | c05a1db88d2a81b5aa93881c9791bcaadaad6304 (patch) | |
tree | d73dffe098cee08330fc73b1a66cc8e640f39ad8 /src/Entities/Player.h | |
parent | Fix Linux compile (diff) | |
download | cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar.gz cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar.bz2 cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar.lz cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar.xz cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.tar.zst cuberite-c05a1db88d2a81b5aa93881c9791bcaadaad6304.zip |
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r-- | src/Entities/Player.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index a795bb9eb..f9404dfaf 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -50,7 +50,7 @@ public: /// Returns the curently equipped weapon; empty item if none virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); } - /// Returns the currently equipped helmet; empty item if nonte + /// Returns the currently equipped helmet; empty item if none virtual cItem GetEquippedHelmet(void) const override { return m_Inventory.GetEquippedHelmet(); } /// Returns the currently equipped chestplate; empty item if none @@ -165,11 +165,6 @@ public: // tolua_end void SetIP(const AString & a_IP); - - float GetLastBlockActionTime() { return m_LastBlockActionTime; } - int GetLastBlockActionCnt() { return m_LastBlockActionCnt; } - void SetLastBlockActionCnt( int ); - void SetLastBlockActionTime(); // Sets the current gamemode, doesn't check validity, doesn't send update packets to client void LoginSetGameMode(eGameMode a_GameMode); @@ -416,12 +411,8 @@ protected: cWindow * m_CurrentWindow; cWindow * m_InventoryWindow; - float m_TimeLastPickupCheck; - char m_Color; - float m_LastBlockActionTime; - int m_LastBlockActionCnt; eGameMode m_GameMode; AString m_IP; |