diff options
author | Tycho <work.tycho+git@gmail.com> | 2015-01-16 14:49:22 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2015-01-16 14:56:18 +0100 |
commit | 05c40db060809612e6d0bb3bee596c4c95ce758d (patch) | |
tree | 72d1912f0f0be7820aff04040e3edfd874d88767 /src/Entities/Pickup.h | |
parent | Converted MinecartEntity to std::chrono (diff) | |
download | cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar.gz cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar.bz2 cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar.lz cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar.xz cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.tar.zst cuberite-05c40db060809612e6d0bb3bee596c4c95ce758d.zip |
Diffstat (limited to 'src/Entities/Pickup.h')
-rw-r--r-- | src/Entities/Pickup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h index 67f2756ca..ed5949f37 100644 --- a/src/Entities/Pickup.h +++ b/src/Entities/Pickup.h @@ -37,10 +37,10 @@ public: virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; /** Returns the number of ticks that this entity has existed */ - int GetAge(void) const { return static_cast<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 = static_cast<float>(a_Age * 50); } // tolua_export + void SetAge(int a_Age) { m_Timer = cTickTime(a_Age); } // tolua_export /** Returns true if the pickup has already been collected */ bool IsCollected(void) const { return m_bCollected; } // tolua_export @@ -51,7 +51,7 @@ public: private: /** The number of ticks that the entity has existed / timer between collect and destroy; in msec */ - float m_Timer; + std::chrono::milliseconds m_Timer; cItem m_Item; |