diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/debugwindow.cpp | 18 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index f1b24a49..06d50d5c 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -181,23 +181,23 @@ public: int flags = 0; if (mGrid->isSelected()) - flags |= Map::MAP_GRID; + flags |= Map::DEBUG_GRID; if (mCollisionTiles->isSelected()) - flags |= Map::MAP_COLLISION_TILES; + flags |= Map::DEBUG_COLLISION_TILES; if (mBeingCollisionRadius->isSelected()) - flags |= Map::MAP_BEING_COLLISION_RADIUS; + flags |= Map::DEBUG_BEING_COLLISION_RADIUS; if (mBeingPosition->isSelected()) - flags |= Map::MAP_BEING_POSITION; + flags |= Map::DEBUG_BEING_POSITION; if (mBeingPath->isSelected()) - flags |= Map::MAP_BEING_PATH; + flags |= Map::DEBUG_BEING_PATH; if (mMousePath->isSelected()) - flags |= Map::MAP_MOUSE_PATH; + flags |= Map::DEBUG_MOUSE_PATH; if (mSpecial1->isSelected()) - flags |= Map::MAP_SPECIAL1; + flags |= Map::DEBUG_SPECIAL1; if (mSpecial2->isSelected()) - flags |= Map::MAP_SPECIAL2; + flags |= Map::DEBUG_SPECIAL2; if (mSpecial3->isSelected()) - flags |= Map::MAP_SPECIAL3; + flags |= Map::DEBUG_SPECIAL3; viewport->setShowDebugPath(flags); } 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)); |