1
0

Merge pull request #646 from worktycho/warningfixes

Fixed most of the reordering warnings
This commit is contained in:
Alexander Harkness 2014-02-05 18:24:08 +00:00
commit b9aa0420a3
10 changed files with 27 additions and 27 deletions

View File

@ -50,6 +50,8 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_TicksSinceLastFireDamage(0) , m_TicksSinceLastFireDamage(0)
, m_TicksLeftBurning(0) , m_TicksLeftBurning(0)
, m_TicksSinceLastVoidDamage(0) , m_TicksSinceLastVoidDamage(0)
, m_IsSwimming(false)
, m_IsSubmerged(false)
, m_HeadYaw( 0.0 ) , m_HeadYaw( 0.0 )
, m_Rot(0.0, 0.0, 0.0) , m_Rot(0.0, 0.0, 0.0)
, m_Pos(a_X, a_Y, a_Z) , m_Pos(a_X, a_Y, a_Z)
@ -57,8 +59,6 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_Mass (0.001) // Default 1g , m_Mass (0.001) // Default 1g
, m_Width(a_Width) , m_Width(a_Width)
, m_Height(a_Height) , m_Height(a_Height)
, m_IsSubmerged(false)
, m_IsSwimming(false)
{ {
cCSLock Lock(m_CSCount); cCSLock Lock(m_CSCount);
m_EntityCount++; m_EntityCount++;

View File

@ -103,10 +103,10 @@ protected:
cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime) : cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime) :
cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2), cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2),
m_PickupCountDown(0),
m_PlayerID(a_PlayerID),
m_CanPickupItem(false), m_CanPickupItem(false),
m_PickupCountDown(0),
m_CountDownTime(a_CountDownTime), m_CountDownTime(a_CountDownTime),
m_PlayerID(a_PlayerID),
m_AttachedMobID(-1) m_AttachedMobID(-1)
{ {
SetSpeed(a_Speed); SetSpeed(a_Speed);

View File

@ -24,11 +24,11 @@ class cMinecartCollisionCallback :
{ {
public: public:
cMinecartCollisionCallback(Vector3d a_Pos, double a_Height, double a_Width, int a_UniqueID, int a_AttacheeUniqueID) : cMinecartCollisionCallback(Vector3d a_Pos, double a_Height, double a_Width, int a_UniqueID, int a_AttacheeUniqueID) :
m_DoesInteserct(false),
m_CollidedEntityPos(0, 0, 0),
m_Pos(a_Pos), m_Pos(a_Pos),
m_Height(a_Height), m_Height(a_Height),
m_Width(a_Width), m_Width(a_Width),
m_DoesInteserct(false),
m_CollidedEntityPos(0, 0, 0),
m_UniqueID(a_UniqueID), m_UniqueID(a_UniqueID),
m_AttacheeUniqueID(a_AttacheeUniqueID) m_AttacheeUniqueID(a_AttacheeUniqueID)
{ {
@ -1057,8 +1057,8 @@ void cMinecartWithChest::OnRightClicked(cPlayer & a_Player)
cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) : cMinecartWithFurnace::cMinecartWithFurnace(double a_X, double a_Y, double a_Z) :
super(mpFurnace, a_X, a_Y, a_Z), super(mpFurnace, a_X, a_Y, a_Z),
m_IsFueled(false), m_FueledTimeLeft(-1),
m_FueledTimeLeft(-1) m_IsFueled(false)
{ {
} }
@ -1137,4 +1137,4 @@ cMinecartWithHopper::cMinecartWithHopper(double a_X, double a_Y, double a_Z) :
} }
// TODO: Make it suck up blocks and travel further than any other cart and physics and put and take blocks // TODO: Make it suck up blocks and travel further than any other cart and physics and put and take blocks
// AND AVARYTHING!! // AND AVARYTHING!!

View File

@ -22,9 +22,9 @@ class cPickupCombiningCallback :
{ {
public: public:
cPickupCombiningCallback(Vector3d a_Position, cPickup * a_Pickup) : cPickupCombiningCallback(Vector3d a_Position, cPickup * a_Pickup) :
m_FoundMatchingPickup(false),
m_Position(a_Position), m_Position(a_Position),
m_Pickup(a_Pickup), m_Pickup(a_Pickup)
m_FoundMatchingPickup(false)
{ {
} }

View File

@ -55,9 +55,9 @@ public:
m_ItemType (a_ItemType), m_ItemType (a_ItemType),
m_ItemCount (a_ItemCount), m_ItemCount (a_ItemCount),
m_ItemDamage (a_ItemDamage), m_ItemDamage (a_ItemDamage),
m_Enchantments(a_Enchantments),
m_CustomName (a_CustomName), m_CustomName (a_CustomName),
m_Lore (a_Lore) m_Lore (a_Lore),
m_Enchantments(a_Enchantments)
{ {
if (!IsValidItem(m_ItemType)) if (!IsValidItem(m_ItemType))
{ {
@ -75,9 +75,9 @@ public:
m_ItemType (a_CopyFrom.m_ItemType), m_ItemType (a_CopyFrom.m_ItemType),
m_ItemCount (a_CopyFrom.m_ItemCount), m_ItemCount (a_CopyFrom.m_ItemCount),
m_ItemDamage (a_CopyFrom.m_ItemDamage), m_ItemDamage (a_CopyFrom.m_ItemDamage),
m_Enchantments(a_CopyFrom.m_Enchantments),
m_CustomName (a_CopyFrom.m_CustomName), m_CustomName (a_CopyFrom.m_CustomName),
m_Lore (a_CopyFrom.m_Lore) m_Lore (a_CopyFrom.m_Lore),
m_Enchantments(a_CopyFrom.m_Enchantments)
{ {
} }

View File

@ -69,20 +69,20 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
: super(etMonster, a_Width, a_Height) : super(etMonster, a_Width, a_Height)
, m_EMState(IDLE) , m_EMState(IDLE)
, m_EMPersonality(AGGRESSIVE) , m_EMPersonality(AGGRESSIVE)
, m_SightDistance(25)
, m_Target(NULL) , m_Target(NULL)
, m_AttackRate(3)
, m_IdleInterval(0)
, m_bMovingToDestination(false) , m_bMovingToDestination(false)
, m_LastGroundHeight(POSY_TOINT)
, m_IdleInterval(0)
, m_DestroyTimer(0) , m_DestroyTimer(0)
, m_MobType(a_MobType) , m_MobType(a_MobType)
, m_SoundHurt(a_SoundHurt) , m_SoundHurt(a_SoundHurt)
, m_SoundDeath(a_SoundDeath) , m_SoundDeath(a_SoundDeath)
, m_AttackRate(3)
, m_AttackDamage(1) , m_AttackDamage(1)
, m_AttackRange(2) , m_AttackRange(2)
, m_AttackInterval(0) , m_AttackInterval(0)
, m_SightDistance(25)
, m_BurnsInDaylight(false) , m_BurnsInDaylight(false)
, m_LastGroundHeight(POSY_TOINT)
{ {
if (!a_ConfigName.empty()) if (!a_ConfigName.empty())
{ {

View File

@ -13,9 +13,9 @@
cVillager::cVillager(eVillagerType VillagerType) : cVillager::cVillager(eVillagerType VillagerType) :
super("Villager", mtVillager, "", "", 0.6, 1.8), super("Villager", mtVillager, "", "", 0.6, 1.8),
m_ActionCountDown(-1),
m_Type(VillagerType), m_Type(VillagerType),
m_VillagerAction(false), m_VillagerAction(false)
m_ActionCountDown(-1)
{ {
} }

View File

@ -197,8 +197,8 @@ cTeam::cTeam(const AString & a_Name, const AString & a_DisplayName,
const AString & a_Prefix, const AString & a_Suffix) const AString & a_Prefix, const AString & a_Suffix)
: m_AllowsFriendlyFire(true) : m_AllowsFriendlyFire(true)
, m_CanSeeFriendlyInvisible(false) , m_CanSeeFriendlyInvisible(false)
, m_Name(a_Name)
, m_DisplayName(a_DisplayName) , m_DisplayName(a_DisplayName)
, m_Name(a_Name)
, m_Prefix(a_Prefix) , m_Prefix(a_Prefix)
, m_Suffix(a_Suffix) , m_Suffix(a_Suffix)
{} {}

View File

@ -946,11 +946,11 @@ void cRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_BlockY, int a_B
{ {
public: public:
cWoodenPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) : cWoodenPressurePlateCallback(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
m_Entity(NULL),
m_World(a_World),
m_X(a_BlockX), m_X(a_BlockX),
m_Y(a_BlockY), m_Y(a_BlockY),
m_Z(a_BlockZ), m_Z(a_BlockZ)
m_World(a_World),
m_Entity(NULL)
{ {
} }

View File

@ -247,9 +247,9 @@ cWorld::cWorld(const AString & a_WorldName) :
m_SkyDarkness(0), m_SkyDarkness(0),
m_Weather(eWeather_Sunny), m_Weather(eWeather_Sunny),
m_WeatherInterval(24000), // Guaranteed 1 day of sunshine at server start :) m_WeatherInterval(24000), // Guaranteed 1 day of sunshine at server start :)
m_Scoreboard(this),
m_GeneratorCallbacks(*this), m_GeneratorCallbacks(*this),
m_TickThread(*this), m_TickThread(*this)
m_Scoreboard(this)
{ {
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str()); LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());