summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-01 22:24:36 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-09 13:48:52 +0100
commitc05a1db88d2a81b5aa93881c9791bcaadaad6304 (patch)
treed73dffe098cee08330fc73b1a66cc8e640f39ad8 /src/Entities
parentFix Linux compile (diff)
downloadcuberite-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 '')
-rw-r--r--src/Entities/Player.cpp25
-rw-r--r--src/Entities/Player.h11
2 files changed, 1 insertions, 35 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index f4039e548..2a62931ab 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -38,10 +38,7 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
, m_Inventory(*this)
, m_CurrentWindow(NULL)
, m_InventoryWindow(NULL)
- , m_TimeLastPickupCheck(0.f)
, m_Color('-')
- , m_LastBlockActionTime(0)
- , m_LastBlockActionCnt(0)
, m_GameMode(eGameMode_NotSet)
, m_IP("")
, m_ClientHandle(a_Client)
@@ -79,7 +76,6 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
m_LastPlayerListTime = t1.GetNowTime();
m_TimeLastTeleportPacket = 0;
- m_TimeLastPickupCheck = 0;
m_PlayerName = a_PlayerName;
m_bDirtyPosition = true; // So chunks are streamed to player at spawn
@@ -1055,27 +1051,6 @@ void cPlayer::CloseWindowIfID(char a_WindowID, bool a_CanRefuse)
-void cPlayer::SetLastBlockActionTime()
-{
- if (m_World != NULL)
- {
- m_LastBlockActionTime = m_World->GetWorldAge() / 20.0f;
- }
-}
-
-
-
-
-
-void cPlayer::SetLastBlockActionCnt( int a_LastBlockActionCnt )
-{
- m_LastBlockActionCnt = a_LastBlockActionCnt;
-}
-
-
-
-
-
void cPlayer::SetGameMode(eGameMode a_GameMode)
{
if ((a_GameMode < gmMin) || (a_GameMode >= gmMax))
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;