Add empty map mode without collisions.

Mode can be switched from yellow bar.
Also renamed map draw type related variables and methods.

1 files changed, 21 insertions, 15 deletions

diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index 2b8d4b514..308e27c86 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -92,7 +92,7 @@ void MapLayer::setTile(const int x, const int y, Image *const img)
 void MapLayer::draw(Graphics *const graphics,
                     int startX, int startY, int endX, int endY,
                     const int scrollX, const int scrollY,
-                    const int debugFlags) const
+                    const int layerDrawFlags) const
 {
     if (!player_node)
         return;
@@ -114,8 +114,9 @@ void MapLayer::draw(Graphics *const graphics,
 
     const int dx = (mX * mapTileSize) - scrollX;
     const int dy = (mY * mapTileSize) - scrollY + mapTileSize;
-    const bool flag = (debugFlags != MapType::SPECIAL
-        && debugFlags != MapType::SPECIAL2);
+    const bool flag = (layerDrawFlags != MapType::SPECIAL
+        && layerDrawFlags != MapType::SPECIAL2
+        && layerDrawFlags != MapType::SPECIAL4);
 
     for (int y = startY; y < endY; y++)
     {
@@ -185,7 +186,7 @@ void MapLayer::updateSDL(const Graphics *const graphics,
                          int startX, int startY,
                          int endX, int endY,
                          const int scrollX, const int scrollY,
-                         const int debugFlags)
+                         const int layerDrawFlags)
 {
     BLOCK_START("MapLayer::updateSDL")
     delete_all(mTempRows);
@@ -207,8 +208,9 @@ void MapLayer::updateSDL(const Graphics *const graphics,
 
     const int dx = (mX * mapTileSize) - scrollX;
     const int dy = (mY * mapTileSize) - scrollY + mapTileSize;
-    const bool flag = (debugFlags != MapType::SPECIAL
-        && debugFlags != MapType::SPECIAL2);
+    const bool flag = (layerDrawFlags != MapType::SPECIAL
+        && layerDrawFlags != MapType::SPECIAL2
+        && layerDrawFlags != MapType::SPECIAL4);
 
     for (int y = startY; y < endY; y++)
     {
@@ -250,7 +252,7 @@ void MapLayer::updateOGL(Graphics *const graphics,
                          int startX, int startY,
                          int endX, int endY,
                          const int scrollX, const int scrollY,
-                         const int debugFlags)
+                         const int layerDrawFlags)
 {
     BLOCK_START("MapLayer::updateOGL")
     delete_all(mTempRows);
@@ -272,8 +274,9 @@ void MapLayer::updateOGL(Graphics *const graphics,
 
     const int dx = (mX * mapTileSize) - scrollX;
     const int dy = (mY * mapTileSize) - scrollY + mapTileSize;
-    const bool flag = (debugFlags != MapType::SPECIAL
-        && debugFlags != MapType::SPECIAL2);
+    const bool flag = (layerDrawFlags != MapType::SPECIAL
+        && layerDrawFlags != MapType::SPECIAL2
+        && layerDrawFlags != MapType::SPECIAL4);
 
     MapRowVertexes *const row = new MapRowVertexes();
     mTempRows.push_back(row);
@@ -365,7 +368,7 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
                           int endX, int endY,
                           const int scrollX, const int scrollY,
                           const Actors *const actors,
-                          const int debugFlags, const int yFix) const
+                          const int layerDrawFlags, const int yFix) const
 {
     BLOCK_START("MapLayer::drawFringe")
     if (!player_node || !mSpecialLayer || !mTempLayer)
@@ -413,8 +416,9 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
         }
         BLOCK_END("MapLayer::drawFringe drawmobs")
 
-        if (debugFlags == MapType::SPECIAL3
-            || debugFlags == MapType::BLACKWHITE)
+        if (layerDrawFlags == MapType::SPECIAL3
+            || layerDrawFlags == MapType::SPECIAL4
+            || layerDrawFlags == MapType::BLACKWHITE)
         {
             if (y < specialHeight)
             {
@@ -463,8 +467,9 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
                 {
                     const int px = x32 + dx;
                     const int py = py0 - img->mBounds.h;
-                    if ((debugFlags != MapType::SPECIAL
-                        && debugFlags != MapType::SPECIAL2)
+                    if ((layerDrawFlags != MapType::SPECIAL
+                        && layerDrawFlags != MapType::SPECIAL2
+                        && layerDrawFlags != MapType::SPECIAL4)
                         || img->mBounds.h <= mapTileSize)
                     {
                         int width = 0;
@@ -522,7 +527,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
     }
 
     // Draw any remaining actors
-    if (debugFlags != MapType::SPECIAL3)
+    if (layerDrawFlags != MapType::SPECIAL3
+        && layerDrawFlags != MapType::SPECIAL4)
     {
         BLOCK_START("MapLayer::drawFringe drawmobs")
         while (ai != ai_end)