From 00f9e6e9983a3055a6d21a3bf84d6e7699fe4138 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 9 Mar 2014 14:56:02 +0300 Subject: Reoder variables in viewport. --- src/gui/viewport.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/viewport.h') 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. */ -- cgit v1.2.3-60-g2f50