summaryrefslogtreecommitdiff
path: root/src/gui/viewport.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-09 14:56:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-09 14:56:20 +0300
commit00f9e6e9983a3055a6d21a3bf84d6e7699fe4138 (patch)
treead8e3b6f5381610415144e9098c30b43b5c028ef /src/gui/viewport.h
parentf661878450acdd32ebac6ee8c7680a09dbf8b9ec (diff)
downloadmv-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.gz
mv-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.bz2
mv-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.xz
mv-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.zip
Reoder variables in viewport.
Diffstat (limited to 'src/gui/viewport.h')
-rw-r--r--src/gui/viewport.h30
1 files changed, 15 insertions, 15 deletions
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. */