Move "map draw type" variable into settings.

2 files changed, 11 insertions, 16 deletions

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index fb52607c7..5a2c9cc91 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -25,6 +25,7 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "game.h"
+#include "settings.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
@@ -79,7 +80,6 @@ Viewport::Viewport() :
     mMousePressY(0),
     mPixelViewX(0),
     mPixelViewY(0),
-    mMapDrawType(MapType::NORMAL),
     mCameraMode(0),
     mLocalWalkTime(-1),
     mCameraRelativeX(0),
@@ -241,14 +241,15 @@ void Viewport::draw(Graphics *graphics)
     // Draw tiles and sprites
     mMap->draw(graphics, mPixelViewX, mPixelViewY);
 
-    if (mMapDrawType != MapType::NORMAL)
+    const MapType::MapType drawType = settings.mapDrawType;
+    if (drawType != MapType::NORMAL)
     {
-        if (mMapDrawType != MapType::SPECIAL4)
+        if (drawType != MapType::SPECIAL4)
         {
             mMap->drawCollision(graphics, mPixelViewX,
-                mPixelViewY, mMapDrawType);
+                mPixelViewY, drawType);
         }
-        if (mMapDrawType == MapType::DEBUG)
+        if (drawType == MapType::DEBUG)
             drawDebugPath(graphics);
     }
 
@@ -1001,11 +1002,12 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
 
 void Viewport::toggleMapDrawType()
 {
-    mMapDrawType++;
-    if (mMapDrawType > MapType::BLACKWHITE)
-        mMapDrawType = MapType::NORMAL;
+    settings.mapDrawType = static_cast<MapType::MapType>(
+        static_cast<int>(settings.mapDrawType) + 1);
+    if (settings.mapDrawType > MapType::BLACKWHITE)
+        settings.mapDrawType = MapType::NORMAL;
     if (mMap)
-        mMap->setDrawLayersFlags(mMapDrawType);
+        mMap->setDrawLayersFlags(settings.mapDrawType);
 }
 
 void Viewport::toggleCameraMode()
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 4a7abea93..9ed4b3f7f 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -242,12 +242,6 @@ class Viewport final : public WindowContainer,
         void scrollBy(const int x, const int y)
         { mPixelViewX += x; mPixelViewY += y; }
 
-        int getMapDrawType() const A_WARN_UNUSED
-        { return mMapDrawType; }
-
-        void setMapDrawType(const int n)
-        { mMapDrawType = n; }
-
         int getCameraMode() const A_WARN_UNUSED
         { return mCameraMode; }
 
@@ -344,7 +338,6 @@ class Viewport final : public WindowContainer,
         int mMousePressY;
         int mPixelViewX;            /**< Current viewpoint in pixels. */
         int mPixelViewY;            /**< Current viewpoint in pixels. */
-        int mMapDrawType;         /**< Show a path from player to pointer. */
         int mCameraMode;            /**< Camera mode. */
 
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */