Fixed compile-time warning in TNTEntity.
The FuseTime is now a double instead of a float
This commit is contained in:
parent
b82dd8868c
commit
4a3d0fcff5
@ -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),
|
||||
m_Counter(0),
|
||||
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),
|
||||
m_Counter(0),
|
||||
m_MaxFuseTime(a_FuseTimeInSec)
|
||||
|
@ -16,8 +16,8 @@ class cTNTEntity :
|
||||
public:
|
||||
CLASS_PROTODEF(cTNTEntity);
|
||||
|
||||
cTNTEntity(double a_X, double a_Y, double a_Z, float a_FuseTimeInSec);
|
||||
cTNTEntity(const Vector3d & a_Pos, float a_FuseTimeInSec);
|
||||
cTNTEntity(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec);
|
||||
cTNTEntity(const Vector3d & a_Pos, double a_FuseTimeInSec);
|
||||
|
||||
// cEntity overrides:
|
||||
virtual bool Initialize(cWorld * a_World) override;
|
||||
@ -25,8 +25,8 @@ public:
|
||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||
|
||||
protected:
|
||||
float 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_Counter; ///< How much time has elapsed since the object was created, in seconds
|
||||
double m_MaxFuseTime; ///< How long the fuse is, in seconds
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user