summaryrefslogtreecommitdiffstats
path: root/src/Entities/Pickup.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-21 18:12:40 +0200
committerMattes D <github@xoft.cz>2014-10-21 18:12:40 +0200
commitbcb839d07bd9b0cea4cd8af021db76ae0822f7a9 (patch)
tree1970b9d1650e63ed5bec88308d70736d13463e09 /src/Entities/Pickup.h
parentUpdated ProtectionAreas (diff)
parentfix std:min call, include algorithm and compare same type (diff)
downloadcuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar.gz
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar.bz2
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar.lz
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar.xz
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.tar.zst
cuberite-bcb839d07bd9b0cea4cd8af021db76ae0822f7a9.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Pickup.h10
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
-
-
-
-