flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed compile-time warning in TNTEntity.

Browse Source 
The FuseTime is now a double instead of a float
This commit is contained in:
madmaxoft 2013-08-17 18:08:39 +02:00
parent b82dd8868c
commit 4a3d0fcff5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/TNTEntity.cpp
View File

@ -8,7 +8,7 @@
cTNTEntity::cTNTEntity(double a_X, double a_Y, double a_Z, float a_FuseTimeInSec) : cTNTEntity::cTNTEntity(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec) :
super(etTNT, a_X, a_Y, a_Z, 0.98, 0.98), super(etTNT, a_X, a_Y, a_Z, 0.98, 0.98),
m_Counter(0), m_Counter(0),
m_MaxFuseTime(a_FuseTimeInSec) m_MaxFuseTime(a_FuseTimeInSec)
@ -19,7 +19,7 @@ cTNTEntity::cTNTEntity(double a_X, double a_Y, double a_Z, float a_FuseTimeInSec
cTNTEntity::cTNTEntity(const Vector3d & a_Pos, float a_FuseTimeInSec) : cTNTEntity::cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec) :
super(etTNT, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98), super(etTNT, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98),
m_Counter(0), m_Counter(0),
m_MaxFuseTime(a_FuseTimeInSec) m_MaxFuseTime(a_FuseTimeInSec)

8
source/TNTEntity.h
View File

@ -16,8 +16,8 @@ class cTNTEntity :
public: public:
CLASS_PROTODEF(cTNTEntity); CLASS_PROTODEF(cTNTEntity);
cTNTEntity(double a_X, double a_Y, double a_Z, float a_FuseTimeInSec); cTNTEntity(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec);
cTNTEntity(const Vector3d & a_Pos, float a_FuseTimeInSec); cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec);
// cEntity overrides: // cEntity overrides:
virtual bool Initialize(cWorld * a_World) override; virtual bool Initialize(cWorld * a_World) override;
@ -25,8 +25,8 @@ public:
virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
protected: protected:
float m_Counter; ///< How much time has elapsed since the object was created, in seconds double m_Counter; ///< How much time has elapsed since the object was created, in seconds
float m_MaxFuseTime; ///< How long the fuse is, in seconds double m_MaxFuseTime; ///< How long the fuse is, in seconds
}; };