diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-09 14:56:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-09 14:56:20 +0300 |
| commit | 00f9e6e9983a3055a6d21a3bf84d6e7699fe4138 (patch) | |
| tree | ad8e3b6f5381610415144e9098c30b43b5c028ef /src/gui/viewport.cpp | |
| parent | f661878450acdd32ebac6ee8c7680a09dbf8b9ec (diff) | |
| download | ManaVerse-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.gz ManaVerse-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.bz2 ManaVerse-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.tar.xz ManaVerse-00f9e6e9983a3055a6d21a3bf84d6e7699fe4138.zip | |
Reoder variables in viewport.
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 30 |
1 files changed, 15 insertions, 15 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(); |