diff options
author | madmaxoft <github@xoft.cz> | 2013-12-20 17:11:51 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-12-20 17:11:51 +0100 |
commit | 8570d08eb4f9f3e1b30fe7758e8b136213e6bf48 (patch) | |
tree | 8f3cb55d694e9e1fefe72979a3f061fc394f6787 | |
parent | Fixed a typo in cBlockArea merging code. (diff) | |
download | cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar.gz cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar.bz2 cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar.lz cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar.xz cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.tar.zst cuberite-8570d08eb4f9f3e1b30fe7758e8b136213e6bf48.zip |
-rw-r--r-- | src/Entities/Entity.cpp | 4 | ||||
-rw-r--r-- | src/Entities/Floater.cpp | 15 | ||||
-rw-r--r-- | src/Entities/ProjectileEntity.cpp | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 37fdc38ee..8fcdcc82f 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -51,13 +51,13 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_TicksSinceLastBurnDamage(0) , m_TicksSinceLastLavaDamage(0) , m_TicksSinceLastFireDamage(0) - , m_TicksSinceLastVoidDamage(0) , m_TicksLeftBurning(0) + , m_TicksSinceLastVoidDamage(0) , m_HeadYaw( 0.0 ) , m_Rot(0.0, 0.0, 0.0) , m_Pos(a_X, a_Y, a_Z) - , m_Mass (0.001) //Default 1g , m_WaterSpeed(0, 0, 0) + , m_Mass (0.001) // Default 1g , m_Width(a_Width) , m_Height(a_Height) { diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index 1aa0413d9..bd7c952a8 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -1,14 +1,19 @@ + #include "Globals.h" #include "Floater.h" #include "Player.h" #include "../ClientHandle.h" + + + + cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID) : cEntity(etFloater, a_X, a_Y, a_Z, 0.98, 0.98), + m_PickupCountDown(0), m_PlayerID(a_PlayerID), - m_CanPickupItem(false), - m_PickupCountDown(0) + m_CanPickupItem(false) { SetSpeed(a_Speed); } @@ -55,4 +60,8 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk) } } BroadcastMovementUpdate(); -}
\ No newline at end of file +} + + + + diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index e6355c788..9e5069ba6 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -420,9 +420,9 @@ cArrowEntity::cArrowEntity(cPlayer & a_Player, double a_Force) : m_DamageCoeff(2), m_IsCritical((a_Force >= 1)), m_Timer(0), + m_HitGroundTimer(0), m_bIsCollected(false), - m_HitBlockPos(0, 0, 0), - m_HitGroundTimer(0) + m_HitBlockPos(0, 0, 0) { } |