move bools in localplayer.

2 files changed, 43 insertions, 43 deletions

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 9342b6541..820295570 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -94,7 +94,6 @@ extern SkillDialog *skillDialog;
 
 LocalPlayer::LocalPlayer(const int id, const int subtype) :
     Being(id, PLAYER, subtype, nullptr),
-    mUpdateName(true),
     mGMLevel(0),
     mInvertDirection(0),
     mCrazyMoveType(config.getIntValue("crazyMoveType")),
@@ -102,7 +101,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mAttackWeaponType(config.getIntValue("attackWeaponType")),
     mQuickDropCounter(config.getIntValue("quickDropCounter")),
     mMoveState(0),
-    mDisableCrazyMove(false),
     mPickUpType(config.getIntValue("pickUpType")),
     mMagicAttackType(config.getIntValue("magicAttackType")),
     mPvpAttackType(config.getIntValue("pvpAttackType")),
@@ -110,7 +108,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mAttackType(config.getIntValue("attackType")),
     mFollowMode(config.getIntValue("followMode")),
     mImitationMode(config.getIntValue("imitationMode")),
-    mDisableGameModifiers(config.getBoolValue("disableGameModifiers")),
     mLastTargetX(0),
     mLastTargetY(0),
     mHomes(),
@@ -120,11 +117,7 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mNextDestX(0),
     mNextDestY(0),
     mPickUpTarget(nullptr),
-    mGoingToTarget(false),
-    mKeepAttacking(false),
     mLastAction(-1),
-    mWalkingDir(0),
-    mPathSetByMouse(false),
     mStatusEffectIcons(),
     mLocalWalkTime(-1),
     mMessages(),
@@ -132,18 +125,8 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mAwayListener(new AwayListener),
     mAwayDialog(nullptr),
     mPingSendTick(0),
-    mWaitPing(false),
     mPingTime(0),
     mAfkTime(0),
-    mAwayMode(false),
-    mPseudoAwayMode(false),
-    mShowNavigePath(false),
-    mIsServerBuggy(serverConfig.getValueBool("enableBuggyServers", true)),
-    mSyncPlayerMove(config.getBoolValue("syncPlayerMove")),
-    mDrawPath(config.getBoolValue("drawPath")),
-    mAttackMoving(config.getBoolValue("attackMoving")),
-    mAttackNext(config.getBoolValue("attackNext")),
-    mShowJobExp(config.getBoolValue("showJobExp")),
     mActivityTime(0),
     mNavigateX(0),
     mNavigateY(0),
@@ -155,8 +138,6 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mOldTileX(0),
     mOldTileY(0),
     mNavigatePath(),
-    mTargetDeadPlayers(config.getBoolValue("targetDeadPlayers")),
-    mServerAttack(config.getBoolValue("serverAttack")),
     mLastHitFrom(),
     mWaitFor(),
     mAdvertTime(0),
@@ -164,11 +145,30 @@ LocalPlayer::LocalPlayer(const int id, const int subtype) :
     mTestParticleName(),
     mTestParticleTime(0),
     mTestParticleHash(0l),
+    mWalkingDir(0),
+    mUpdateName(true),
     mBlockAdvert(false),
+    mTargetDeadPlayers(config.getBoolValue("targetDeadPlayers")),
+    mServerAttack(config.getBoolValue("serverAttack")),
     mEnableAdvert(config.getBoolValue("enableAdvert")),
     mTradebot(config.getBoolValue("tradebot")),
     mTargetOnlyReachable(config.getBoolValue("targetOnlyReachable")),
-    mNextStep(false)
+    mDisableGameModifiers(config.getBoolValue("disableGameModifiers")),
+    mIsServerBuggy(serverConfig.getValueBool("enableBuggyServers", true)),
+    mSyncPlayerMove(config.getBoolValue("syncPlayerMove")),
+    mDrawPath(config.getBoolValue("drawPath")),
+    mAttackMoving(config.getBoolValue("attackMoving")),
+    mAttackNext(config.getBoolValue("attackNext")),
+    mShowJobExp(config.getBoolValue("showJobExp")),
+    mNextStep(false),
+    mDisableCrazyMove(false),
+    mGoingToTarget(false),
+    mKeepAttacking(false),
+    mPathSetByMouse(false),
+    mWaitPing(false),
+    mAwayMode(false),
+    mPseudoAwayMode(false),
+    mShowNavigePath(false)
 {
     logger->log1("LocalPlayer::LocalPlayer");
 
diff --git a/src/localplayer.h b/src/localplayer.h
index ee68d3e93..0b036d96e 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -504,8 +504,6 @@ class LocalPlayer final : public Being,
     protected:
         void updateCoords() override;
 
-        /** Whether or not the name settings have changed */
-        bool mUpdateName;
 
         virtual void handleStatusEffect(StatusEffect *const effect,
                                         const int effectId);
@@ -554,8 +552,6 @@ class LocalPlayer final : public Being,
         unsigned int mQuickDropCounter;
         // move state. used if mInvertDirection == 2
         unsigned int mMoveState;
-        // temporary disable crazy moves in moves
-        bool mDisableCrazyMove;
         // pick up type 1x1, normal aka 2x1, forward aka 2x3, 3x3, 3x3 + 1
         unsigned int mPickUpType;
         // magic attack type
@@ -568,8 +564,6 @@ class LocalPlayer final : public Being,
         unsigned int mFollowMode;
         unsigned int mImitationMode;
 
-        bool mDisableGameModifiers;
-
         int mLastTargetX;
         int mLastTargetY;
 
@@ -585,11 +579,7 @@ class LocalPlayer final : public Being,
 
         FloorItem *mPickUpTarget;
 
-        bool mGoingToTarget;
-        bool mKeepAttacking;  // Whether or not to continue to attack
         int mLastAction;      // Time stamp of the last action, -1 if none.
-        unsigned char mWalkingDir;  // The direction the player is walking in.
-        bool mPathSetByMouse;  // Tells if the path was set using mouse
 
         std::vector<int> mStatusEffectIcons;
 
@@ -604,19 +594,8 @@ class LocalPlayer final : public Being,
         OkDialog *mAwayDialog;
 
         int mPingSendTick;
-        bool mWaitPing;
         int mPingTime;
         int mAfkTime;
-        bool mAwayMode;
-        bool mPseudoAwayMode;
-
-        bool mShowNavigePath;
-        bool mIsServerBuggy;
-        bool mSyncPlayerMove;
-        bool mDrawPath;
-        bool mAttackMoving;
-        bool mAttackNext;
-        bool mShowJobExp;
         int mActivityTime;
         int mNavigateX;
         int mNavigateY;
@@ -629,8 +608,6 @@ class LocalPlayer final : public Being,
         int mOldTileY;
         Path mNavigatePath;
 
-        bool mTargetDeadPlayers;
-        bool mServerAttack;
         std::string mLastHitFrom;
         std::string mWaitFor;
         int mAdvertTime;
@@ -638,11 +615,34 @@ class LocalPlayer final : public Being,
         std::string mTestParticleName;
         int mTestParticleTime;
         unsigned long mTestParticleHash;
+        unsigned char mWalkingDir;  // The direction the player is walking in.
+        /** Whether or not the name settings have changed */
+        bool mUpdateName;
         bool mBlockAdvert;
+        bool mTargetDeadPlayers;
+        bool mServerAttack;
         bool mEnableAdvert;
         bool mTradebot;
         bool mTargetOnlyReachable;
+        bool mDisableGameModifiers;
+        bool mIsServerBuggy;
+        bool mSyncPlayerMove;
+        bool mDrawPath;
+        bool mAttackMoving;
+        bool mAttackNext;
+        bool mShowJobExp;
         bool mNextStep;
+        // temporary disable crazy moves in moves
+        bool mDisableCrazyMove;
+        bool mGoingToTarget;
+        // Whether or not to continue to attack
+        bool mKeepAttacking;
+        // Tells if the path was set using mouse
+        bool mPathSetByMouse;
+        bool mWaitPing;
+        bool mAwayMode;
+        bool mPseudoAwayMode;
+        bool mShowNavigePath;
 };
 
 extern LocalPlayer *player_node;