diff options
author | madmaxoft <github@xoft.cz> | 2013-08-19 11:44:11 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-08-19 11:44:11 +0200 |
commit | e80c5eac4041e6e6b2c1bbc8fe67278768098a7a (patch) | |
tree | dd2b008f740367e448ca0b4701be4443c33a0cdd /source/Entities | |
parent | Moved entities into the Entities subfolder. (diff) | |
download | cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar.gz cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar.bz2 cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar.lz cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar.xz cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.tar.zst cuberite-e80c5eac4041e6e6b2c1bbc8fe67278768098a7a.zip |
Diffstat (limited to '')
-rw-r--r-- | source/Entities/Pickup.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/Entities/Pickup.h b/source/Entities/Pickup.h index 1f32c97b5..90292dcb8 100644 --- a/source/Entities/Pickup.h +++ b/source/Entities/Pickup.h @@ -37,16 +37,15 @@ public: virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - short GetHealth(void) const { return m_Health; } - /// Returns the number of ticks that this entity has existed - short GetAge(void) const { return (short)(m_Timer / 50); } + int GetAge(void) const { return (int)(m_Timer / 50); } // tolua_export private: Vector3d m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;) Vector3d m_WaterSpeed; + /// The number of ticks that the entity has existed / timer between collect and destroy; in msec float m_Timer; cItem m_Item; |