summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-30 17:36:07 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-30 17:36:07 +0300
commit9e9a269cc0548f017b756f4158c957fb1edb894f (patch)
tree22b42db764d61b3c4bcdce0886f6e54415d37a16
parentf8b6f8cbb252054404b2716960972669f4047a9f (diff)
downloadmanaverse-9e9a269cc0548f017b756f4158c957fb1edb894f.tar.gz
manaverse-9e9a269cc0548f017b756f4158c957fb1edb894f.tar.bz2
manaverse-9e9a269cc0548f017b756f4158c957fb1edb894f.tar.xz
manaverse-9e9a269cc0548f017b756f4158c957fb1edb894f.zip
Fix possible issue with MapType::DEBUG
Renamed to MapType::DEBUGTYPE
-rw-r--r--src/enums/resources/map/maptype.h12
-rw-r--r--src/gui/viewport.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/enums/resources/map/maptype.h b/src/enums/resources/map/maptype.h
index 2b2d116ce..a5cab16f0 100644
--- a/src/enums/resources/map/maptype.h
+++ b/src/enums/resources/map/maptype.h
@@ -27,12 +27,12 @@
enumStart(MapType)
{
- NORMAL = 0,
- DEBUG = 1,
- SPECIAL = 2,
- SPECIAL2 = 3,
- SPECIAL3 = 4,
- SPECIAL4 = 5,
+ NORMAL = 0,
+ DEBUGTYPE = 1,
+ SPECIAL = 2,
+ SPECIAL2 = 3,
+ SPECIAL3 = 4,
+ SPECIAL4 = 5,
BLACKWHITE = 6
}
enumEnd(MapType);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 8b63c6096..90a32165a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -230,7 +230,7 @@ void Viewport::draw(Graphics *const graphics)
mMap->drawCollision(graphics, mPixelViewX,
mPixelViewY, drawType);
}
- if (drawType == MapType::DEBUG)
+ if (drawType == MapType::DEBUGTYPE)
drawDebugPath(graphics);
}