summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-09 22:43:15 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-09 22:43:15 +0100
commit1985a9c33edc5b929f88871ce553b148408571af (patch)
tree08124cd9f2ea2171710b2dfb764d6b7dfee5701f /src/Entities/Player.h
parentMentiod that we use some c++11 exstensions (diff)
parent!= FACE_NONE (diff)
downloadcuberite-1985a9c33edc5b929f88871ce553b148408571af.tar
cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.gz
cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.bz2
cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.lz
cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.xz
cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.zst
cuberite-1985a9c33edc5b929f88871ce553b148408571af.zip
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r--src/Entities/Player.h11
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;