Reoder variables in viewport.

2 files changed, 30 insertions, 30 deletions

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index cc0aa8778..44e3aaa7d 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -53,32 +53,32 @@ Viewport::Viewport() :
     WindowContainer(nullptr),
     MouseListener(),
     mMap(nullptr),
+    mPopupMenu(new PopupMenu),
+    mHoverBeing(nullptr),
+    mHoverItem(nullptr),
+    mHoverSign(nullptr),
+    mBeingPopup(new BeingPopup),
+    mTextPopup(new TextPopup),
     mScrollRadius(config.getIntValue("ScrollRadius")),
     mScrollLaziness(config.getIntValue("ScrollLaziness")),
-    mShowBeingPopup(config.getBoolValue("showBeingPopup")),
-    mSelfMouseHeal(config.getBoolValue("selfMouseHeal")),
-    mEnableLazyScrolling(config.getBoolValue("enableLazyScrolling")),
     mScrollCenterOffsetX(config.getIntValue("ScrollCenterOffsetX")),
     mScrollCenterOffsetY(config.getIntValue("ScrollCenterOffsetY")),
-    mMouseDirectionMove(config.getBoolValue("mouseDirectionMove")),
-    mLongMouseClick(config.getBoolValue("longmouseclick")),
-    mMouseClicked(false),
     mMouseX(0),
     mMouseY(0),
     mPixelViewX(0),
     mPixelViewY(0),
-    mShowDebugPath(false),
+    mShowDebugPath(Map::MAP_NORMAL),
     mCameraMode(0),
-    mPlayerFollowMouse(false),
     mLocalWalkTime(-1),
-    mPopupMenu(new PopupMenu),
-    mHoverBeing(nullptr),
-    mHoverItem(nullptr),
-    mHoverSign(nullptr),
-    mBeingPopup(new BeingPopup),
-    mTextPopup(new TextPopup),
     mCameraRelativeX(0),
-    mCameraRelativeY(0)
+    mCameraRelativeY(0),
+    mShowBeingPopup(config.getBoolValue("showBeingPopup")),
+    mSelfMouseHeal(config.getBoolValue("selfMouseHeal")),
+    mEnableLazyScrolling(config.getBoolValue("enableLazyScrolling")),
+    mMouseDirectionMove(config.getBoolValue("mouseDirectionMove")),
+    mLongMouseClick(config.getBoolValue("longmouseclick")),
+    mMouseClicked(false),
+    mPlayerFollowMouse(false)
 {
     mBeingPopup->postInit();
     mPopupMenu->postInit();
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 8febd4fe5..4f7ce5727 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -313,16 +313,17 @@ class Viewport final : public WindowContainer,
 
         Map *mMap;                   /**< The current map. */
 
+        PopupMenu *mPopupMenu;       /**< Popup menu. */
+        Being *mHoverBeing;          /**< Being mouse is currently over. */
+        FloorItem *mHoverItem;       /**< FloorItem mouse is currently over. */
+        MapItem *mHoverSign;         /**< Map sign mouse is currently over. */
+        BeingPopup *mBeingPopup;     /**< Being information popup. */
+        TextPopup *mTextPopup;       /**< Map Item information popup. */
+
         int mScrollRadius;
         int mScrollLaziness;
-        bool mShowBeingPopup;
-        bool mSelfMouseHeal;
-        bool mEnableLazyScrolling;
         int mScrollCenterOffsetX;
         int mScrollCenterOffsetY;
-        bool mMouseDirectionMove;
-        bool mLongMouseClick;
-        bool mMouseClicked;
         int mMouseX;                /**< Current mouse position in pixels. */
         int mMouseY;                /**< Current mouse position in pixels. */
         int mPixelViewX;            /**< Current viewpoint in pixels. */
@@ -330,19 +331,18 @@ class Viewport final : public WindowContainer,
         int mShowDebugPath;         /**< Show a path from player to pointer. */
         int mCameraMode;            /**< Camera mode. */
 
-        bool mPlayerFollowMouse;
-
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 
-        PopupMenu *mPopupMenu;       /**< Popup menu. */
-        Being *mHoverBeing;          /**< Being mouse is currently over. */
-        FloorItem *mHoverItem;       /**< FloorItem mouse is currently over. */
-        MapItem *mHoverSign;         /**< Map sign mouse is currently over. */
-        BeingPopup *mBeingPopup;     /**< Being information popup. */
-        TextPopup *mTextPopup;       /**< Map Item information popup. */
-
         int mCameraRelativeX;
         int mCameraRelativeY;
+
+        bool mShowBeingPopup;
+        bool mSelfMouseHeal;
+        bool mEnableLazyScrolling;
+        bool mMouseDirectionMove;
+        bool mLongMouseClick;
+        bool mMouseClicked;
+        bool mPlayerFollowMouse;
 };
 
 extern Viewport *viewport;           /**< The viewport. */