From 2f2b3da534ad7d19afd96cdc92d04052aa63f567 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 May 2014 17:14:27 +0300 Subject: Move maptype into separate file. --- src/gui/viewport.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gui/viewport.cpp') diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index d4e13559a..ec9f5bac3 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -30,6 +30,7 @@ #include "resources/map/mapitem.h" #include "resources/map/maplayer.h" +#include "resources/map/maptype.h" #include "resources/map/speciallayer.h" #include "being/localplayer.h" @@ -75,7 +76,7 @@ Viewport::Viewport() : mMousePressY(0), mPixelViewX(0), mPixelViewY(0), - mShowDebugPath(Map::MAP_NORMAL), + mShowDebugPath(MapType::NORMAL), mCameraMode(0), mLocalWalkTime(-1), mCameraRelativeX(0), @@ -237,7 +238,7 @@ void Viewport::draw(Graphics *graphics) { mMap->drawCollision(graphics, mPixelViewX, mPixelViewY, mShowDebugPath); - if (mShowDebugPath == Map::MAP_DEBUG) + if (mShowDebugPath == MapType::DEBUG) drawDebugPath(graphics); } @@ -989,8 +990,8 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED) void Viewport::toggleDebugPath() { mShowDebugPath++; - if (mShowDebugPath > Map::MAP_BLACKWHITE) - mShowDebugPath = Map::MAP_NORMAL; + if (mShowDebugPath > MapType::BLACKWHITE) + mShowDebugPath = MapType::NORMAL; if (mMap) mMap->setDebugFlags(mShowDebugPath); } -- cgit v1.2.3-70-g09d2