From 9e9a269cc0548f017b756f4158c957fb1edb894f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Apr 2016 17:36:07 +0300 Subject: Fix possible issue with MapType::DEBUG Renamed to MapType::DEBUGTYPE --- src/enums/resources/map/maptype.h | 12 ++++++------ src/gui/viewport.cpp | 2 +- 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); } -- cgit v1.2.3-70-g09d2