From d4584d81599f90b54cbc0fdd1c55b8ab0d5f0d68 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Wed, 14 Sep 2011 01:11:56 +0800 Subject: Renamed Map::DebugFlags enumerators Their name is a bit more clear with DEBUG prefix rather than MAP prefix. They're already scoped in the Map class anyway. MAP_NORMAL was changed to DEBUG_NONE to represent no debug flags. Acked-by: Bertram --- src/gui/viewport.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/viewport.cpp') diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 945be7de..1fa60808 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -201,7 +201,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics) if (mDebugFlags) { - if (mDebugFlags & (Map::MAP_GRID | Map::MAP_COLLISION_TILES)) + if (mDebugFlags & (Map::DEBUG_GRID | Map::DEBUG_COLLISION_TILES)) { mMap->drawCollision(graphics, (int) mPixelViewX, (int) mPixelViewY, mDebugFlags); @@ -294,7 +294,7 @@ void Viewport::_followMouse() void Viewport::_drawDebugPath(Graphics *graphics) { - if (mDebugFlags & Map::MAP_MOUSE_PATH) + if (mDebugFlags & Map::DEBUG_MOUSE_PATH) { // Get the current mouse position SDL_GetMouseState(&mMouseX, &mMouseY); @@ -359,7 +359,7 @@ void Viewport::_drawDebugPath(Graphics *graphics) const Vector &beingPos = being->getPosition(); graphics->setColor(gcn::Color(128, 128, 0, 150)); - if (mDebugFlags & Map::MAP_BEING_COLLISION_RADIUS) + if (mDebugFlags & Map::DEBUG_BEING_COLLISION_RADIUS) { const int radius = being->getCollisionRadius(); graphics->fillRectangle(gcn::Rectangle( @@ -370,10 +370,10 @@ void Viewport::_drawDebugPath(Graphics *graphics) radius * 2, radius * 2)); } - if (mDebugFlags & Map::MAP_BEING_PATH) + if (mDebugFlags & Map::DEBUG_BEING_PATH) _drawPath(graphics, being->getPath(), gcn::Color(0, 0, 255, 150)); - if (mDebugFlags & Map::MAP_BEING_POSITION) + if (mDebugFlags & Map::DEBUG_BEING_POSITION) { // Draw the absolute x, y position using a cross. graphics->setColor(gcn::Color(0, 0, 255, 255)); -- cgit v1.2.3-70-g09d2