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.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/viewport.cpp') 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(); -- cgit v1.2.3-70-g09d2