1
0
Fork 0

More reordering fixes.

This commit is contained in:
madmaxoft 2013-12-20 17:11:51 +01:00
parent fc97cb8c58
commit 8570d08eb4
3 changed files with 16 additions and 7 deletions

View File

@ -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)
{

View File

@ -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();
}
}

View File

@ -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)
{
}