flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Converted cExpOrbEntity to std::chrono

Browse Source
This commit is contained in:
Tycho 2015-01-16 13:27:10 +00:00
parent d6f042da4a
commit 7562a381c0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Entities/ExpOrb.cpp
View File

@ -8,7 +8,7 @@
cExpOrb::cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward) cExpOrb::cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward)
: cEntity(etExpOrb, a_X, a_Y, a_Z, 0.98, 0.98) : cEntity(etExpOrb, a_X, a_Y, a_Z, 0.98, 0.98)
, m_Reward(a_Reward) , m_Reward(a_Reward)
, m_Timer(0.f) , m_Timer(0)
{ {
SetMaxHealth(5); SetMaxHealth(5);
SetHealth(5); SetHealth(5);
@ -21,7 +21,7 @@ cExpOrb::cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward)
cExpOrb::cExpOrb(const Vector3d & a_Pos, int a_Reward) cExpOrb::cExpOrb(const Vector3d & a_Pos, int a_Reward)
: cEntity(etExpOrb, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98) : cEntity(etExpOrb, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98)
, m_Reward(a_Reward) , m_Reward(a_Reward)
, m_Timer(0.f) , m_Timer(0)
{ {
SetMaxHealth(5); SetMaxHealth(5);
SetHealth(5); SetHealth(5);
@ -69,8 +69,8 @@ void cExpOrb::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
} }
HandlePhysics(a_Dt, a_Chunk); HandlePhysics(a_Dt, a_Chunk);
m_Timer += a_Dt.count(); m_Timer += a_Dt;
if (m_Timer >= 1000 * 60 * 5) // 5 minutes if (m_Timer >= std::chrono::minutes(5))
{ {
Destroy(true); Destroy(true);
} }

6
src/Entities/ExpOrb.h
View File

@ -26,10 +26,10 @@ public:
virtual void SpawnOn(cClientHandle & a_Client) override; virtual void SpawnOn(cClientHandle & a_Client) override;
/** Returns the number of ticks that this entity has existed */ /** Returns the number of ticks that this entity has existed */
int GetAge(void) const { return (int)(m_Timer / 50); } // tolua_export int GetAge(void) const { return std::chrono::duration_cast<cTickTime>(m_Timer).count(); } // tolua_export
/** Set the number of ticks that this entity has existed */ /** Set the number of ticks that this entity has existed */
void SetAge(int a_Age) { m_Timer = (float)(a_Age * 50); } // tolua_export void SetAge(int a_Age) { m_Timer = cTickTime(a_Age); } // tolua_export
/** Get the exp amount */ /** Get the exp amount */
int GetReward(void) const { return m_Reward; } // tolua_export int GetReward(void) const { return m_Reward; } // tolua_export
@ -41,5 +41,5 @@ protected:
int m_Reward; int m_Reward;
/** The number of ticks that the entity has existed / timer between collect and destroy; in msec */ /** The number of ticks that the entity has existed / timer between collect and destroy; in msec */
float m_Timer; std::chrono::milliseconds m_Timer;
} ; // tolua_export } ; // tolua_export