summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2015-01-16 14:27:10 +0100
committerTycho <work.tycho+git@gmail.com>2015-01-16 14:27:10 +0100
commit7562a381c004470dfa8f0f94cd00f92d3c413f74 (patch)
treea3563323d9c98cb6216ba8c7e78e137d877df714 /src
parentConverted ArrowEntityTiers to std::chrono (diff)
downloadcuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar.gz
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar.bz2
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar.lz
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar.xz
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.tar.zst
cuberite-7562a381c004470dfa8f0f94cd00f92d3c413f74.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/ExpOrb.cpp8
-rw-r--r--src/Entities/ExpOrb.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Entities/ExpOrb.cpp b/src/Entities/ExpOrb.cpp
index 9767f96ca..db7f6f2c8 100644
--- a/src/Entities/ExpOrb.cpp
+++ b/src/Entities/ExpOrb.cpp
@@ -8,7 +8,7 @@
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)
, m_Reward(a_Reward)
- , m_Timer(0.f)
+ , m_Timer(0)
{
SetMaxHealth(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)
: cEntity(etExpOrb, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98)
, m_Reward(a_Reward)
- , m_Timer(0.f)
+ , m_Timer(0)
{
SetMaxHealth(5);
SetHealth(5);
@@ -69,8 +69,8 @@ void cExpOrb::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
}
HandlePhysics(a_Dt, a_Chunk);
- m_Timer += a_Dt.count();
- if (m_Timer >= 1000 * 60 * 5) // 5 minutes
+ m_Timer += a_Dt;
+ if (m_Timer >= std::chrono::minutes(5))
{
Destroy(true);
}
diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h
index e12e3c504..9aac4f748 100644
--- a/src/Entities/ExpOrb.h
+++ b/src/Entities/ExpOrb.h
@@ -26,10 +26,10 @@ public:
virtual void SpawnOn(cClientHandle & a_Client) override;
/** 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 */
- 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 */
int GetReward(void) const { return m_Reward; } // tolua_export
@@ -41,5 +41,5 @@ protected:
int m_Reward;
/** 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