From 6e052536a2dfb7f877a356477bc86c904aae1e71 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 9 Jul 2014 11:49:46 +0300
Subject: Add empty map mode without collisions.

Mode can be switched from yellow bar.
Also renamed map draw type related variables and methods.
---
 src/gui/viewport.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 225b88f30..1c0694ca3 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -79,7 +79,7 @@ Viewport::Viewport() :
     mMousePressY(0),
     mPixelViewX(0),
     mPixelViewY(0),
-    mShowDebugPath(MapType::NORMAL),
+    mMapDrawType(MapType::NORMAL),
     mCameraMode(0),
     mLocalWalkTime(-1),
     mCameraRelativeX(0),
@@ -122,7 +122,7 @@ Viewport::~Viewport()
 void Viewport::setMap(Map *const map)
 {
     if (mMap && map)
-        map->setDebugFlags(mMap->getDebugFlags());
+        map->setDrawLayersFlags(mMap->getDrawLayersFlags());
     mMap = map;
 }
 
@@ -237,11 +237,14 @@ void Viewport::draw(Graphics *graphics)
     // Draw tiles and sprites
     mMap->draw(graphics, mPixelViewX, mPixelViewY);
 
-    if (mShowDebugPath)
+    if (mMapDrawType != MapType::NORMAL)
     {
-        mMap->drawCollision(graphics, mPixelViewX,
-            mPixelViewY, mShowDebugPath);
-        if (mShowDebugPath == MapType::DEBUG)
+        if (mMapDrawType != MapType::SPECIAL4)
+        {
+            mMap->drawCollision(graphics, mPixelViewX,
+                mPixelViewY, mMapDrawType);
+        }
+        if (mMapDrawType == MapType::DEBUG)
             drawDebugPath(graphics);
     }
 
@@ -990,13 +993,13 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED)
     }
 }
 
-void Viewport::toggleDebugPath()
+void Viewport::toggleMapDrawType()
 {
-    mShowDebugPath++;
-    if (mShowDebugPath > MapType::BLACKWHITE)
-        mShowDebugPath = MapType::NORMAL;
+    mMapDrawType++;
+    if (mMapDrawType > MapType::BLACKWHITE)
+        mMapDrawType = MapType::NORMAL;
     if (mMap)
-        mMap->setDebugFlags(mShowDebugPath);
+        mMap->setDrawLayersFlags(mMapDrawType);
 }
 
 void Viewport::toggleCameraMode()
-- 
cgit v1.2.3-60-g2f50