summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-17 18:08:39 +0200
committermadmaxoft <github@xoft.cz>2013-08-17 18:08:46 +0200
commit4a3d0fcff56b0d72a307f183898d046f66f3e1cc (patch)
treeafcb5f162007adb5642e83c0484df0409f2b7655
parentMerge pull request #100 from mc-server/pluginsubmodules (diff)
downloadcuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar.gz
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar.bz2
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar.lz
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar.xz
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.tar.zst
cuberite-4a3d0fcff56b0d72a307f183898d046f66f3e1cc.zip
-rw-r--r--source/TNTEntity.cpp4
-rw-r--r--source/TNTEntity.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/source/TNTEntity.cpp b/source/TNTEntity.cpp
index 84b56d01a..60625667d 100644
--- a/source/TNTEntity.cpp
+++ b/source/TNTEntity.cpp
@@ -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)
diff --git a/source/TNTEntity.h b/source/TNTEntity.h
index a8487b66f..e3eae24f2 100644
--- a/source/TNTEntity.h
+++ b/source/TNTEntity.h
@@ -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
};