diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
commit | 6f99615cebba82edcad3d6b3981915285bbefc90 (patch) | |
tree | a8213436004b417555927f8f094198305a46af40 /src/Entities/Pickup.h | |
parent | style. (diff) | |
parent | Merged branch 'master' of git://github.com/sriehl/MCServer (diff) | |
download | cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.gz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.bz2 cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.lz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.xz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.zst cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.zip |
Diffstat (limited to 'src/Entities/Pickup.h')
-rw-r--r-- | src/Entities/Pickup.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h index b3cbeee0b..d1176a7cf 100644 --- a/src/Entities/Pickup.h +++ b/src/Entities/Pickup.h @@ -19,7 +19,7 @@ class cPickup : public cEntity { typedef cEntity super; - + public: // tolua_end @@ -37,10 +37,10 @@ public: virtual void Tick(float a_Dt, cChunk & a_Chunk) 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 static_cast<int>(m_Timer / 50); } // 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 = static_cast<float>(a_Age * 50); } // tolua_export /** Returns true if the pickup has already been collected */ bool IsCollected(void) const { return m_bCollected; } // tolua_export @@ -59,7 +59,3 @@ private: bool m_bIsPlayerCreated; }; // tolua_export - - - - |