diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-03-10 18:17:28 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-03-10 18:17:28 +0100 |
commit | 0a509ab85e395bf46e29b7b554d736fadfaed0ba (patch) | |
tree | f67665e089d372b89505f1b9a3ee21c8cd9f0d8c /src/Entities/Player.h | |
parent | Be more parinoid about int sizes (diff) | |
parent | Fixed MSVC2008 compilation. (diff) | |
download | cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.gz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.bz2 cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.lz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.xz cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.tar.zst cuberite-0a509ab85e395bf46e29b7b554d736fadfaed0ba.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; |