From d6de11da07af96c9989d9a80a4ee69dad7e9380e Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 20 Dec 2013 16:39:20 +0100 Subject: Sorted a few constructors to remove warnings. --- src/Entities/Player.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'src/Entities/Player.cpp') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index ca0d625e2..8f30cd4cc 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -36,43 +36,44 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) : super(etPlayer, 0.6, 1.8) - , m_GameMode(eGameMode_NotSet) - , m_IP("") - , m_LastBlockActionTime( 0 ) - , m_LastBlockActionCnt( 0 ) , m_AirLevel( MAX_AIR_LEVEL ) - , m_AirTickTimer( DROWNING_TICKS ) - , m_bVisible( true ) - , m_LastGroundHeight( 0 ) - , m_bTouchGround( false ) - , m_Stance( 0.0 ) - , m_Inventory(*this) - , m_CurrentWindow(NULL) - , m_InventoryWindow(NULL) - , m_TimeLastPickupCheck( 0.f ) - , m_Color('-') - , m_ClientHandle( a_Client ) + , m_AirTickTimer(DROWNING_TICKS) + , m_bVisible(true) , m_FoodLevel(MAX_FOOD_LEVEL) , m_FoodSaturationLevel(5) , m_FoodTickTimer(0) , m_FoodExhaustionLevel(0) , m_FoodPoisonedTicksRemaining(0) + , m_LastJumpHeight(0) + , m_LastGroundHeight(0) + , m_bTouchGround(false) + , m_Stance(0.0) + , m_Inventory(*this) + , m_CurrentWindow(NULL) + , m_InventoryWindow(NULL) + , m_TimeLastPickupCheck(0.f) + , m_Color('-') + , m_LastBlockActionTime(0) + , m_LastBlockActionCnt(0) + , m_GameMode(eGameMode_NotSet) + , m_IP("") + , m_ClientHandle(a_Client) , m_NormalMaxSpeed(0.1) , m_SprintingMaxSpeed(0.13) , m_IsCrouched(false) , m_IsSprinting(false) + , m_IsFlying(false) , m_IsSwimming(false) , m_IsSubmerged(false) - , m_IsFlying(false) - , m_CanFly(false) , m_IsFishing(false) - , m_FloaterID(-1) + , m_CanFly(false) , m_EatingFinishTick(-1) - , m_IsChargingBow(false) - , m_BowCharge(0) - , m_CurrentXp(0) , m_LifetimeTotalXp(0) + , m_CurrentXp(0) , m_bDirtyExperience(false) + , m_IsChargingBow(false) + , m_BowCharge(0) + , m_FloaterID(-1) { LOGD("Created a player object for \"%s\" @ \"%s\" at %p, ID %d", a_PlayerName.c_str(), a_Client->GetIPString().c_str(), -- cgit v1.2.3