1 files changed, 32 insertions, 43 deletions

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index ab09ec4e..2ed891db 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -1,113 +1,102 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "debugwindow.h"
-
 #include <SDL_mouse.h>
 
 #include <guichan/widgets/label.hpp>
 
-#include "button.h"
-#include "gui.h"
+#include "debugwindow.h"
 #include "viewport.h"
 
-#include "../game.h"
+#include "widgets/layout.h"
+
 #include "../engine.h"
+#include "../game.h"
 #include "../particle.h"
 #include "../map.h"
 
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 
 DebugWindow::DebugWindow():
     Window("Debug")
 {
     setWindowName("Debug");
+
     setResizable(true);
     setCloseButton(true);
     setDefaultSize(0, 0, 400, 60);
     loadWindowState();
 
-    mFPSLabel = new gcn::Label("[0 FPS]");
-    mFPSLabel->setPosition(0,0);
-
+    mFPSLabel = new gcn::Label("0 FPS");
     mMusicFileLabel = new gcn::Label("Music: ");
-    mMusicFileLabel->setPosition(0, 15);
-
     mMapLabel = new gcn::Label("Map: ");
-    mMapLabel->setPosition(0, 30);
-
     mMiniMapLabel = new gcn::Label("Mini-Map: ");
-    mMiniMapLabel->setPosition(0, 45);
-
-    mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
-    mTileMouseLabel->setPosition(200, 0);
+    mTileMouseLabel = new gcn::Label("Mouse: 0, 0");
+    mParticleCountLabel = new gcn::Label("Particle count: 0");
 
-    mParticleCountLabel = new gcn::Label("[Particle count: 0]");
-    mParticleCountLabel->setPosition(200, 15);
+    place(0, 0, mFPSLabel);
+    place(3, 0, mTileMouseLabel);
+    place(0, 1, mMusicFileLabel, 2);
+    place(3, 1, mParticleCountLabel);
+    place(0, 2, mMapLabel, 2);
+    place(0, 3, mMiniMapLabel, 2);
 
-    add(mFPSLabel);
-    add(mMusicFileLabel);
-    add(mMiniMapLabel);
-    add(mMapLabel);
-    add(mTileMouseLabel);
-    add(mParticleCountLabel);
+    reflowLayout(375, 0);
 }
 
-void
-DebugWindow::logic()
+void DebugWindow::logic()
 {
     // Get the current mouse position
     int mouseX, mouseY;
     SDL_GetMouseState(&mouseX, &mouseY);
-    int mouseTileX = mouseX + viewport->getCameraX();
-    int mouseTileY = mouseY + viewport->getCameraY();
+    int mouseTileX = mouseX / 32 + viewport->getCameraX();
+    int mouseTileY = mouseY / 32 + viewport->getCameraY();
 
-    mFPSLabel->setCaption("[" + toString(fps) + " FPS]");
+    mFPSLabel->setCaption(toString(fps) + " FPS");
     mFPSLabel->adjustSize();
 
-    mTileMouseLabel->setCaption("[Mouse: " +
-            toString(mouseTileX) + ", " + toString(mouseTileY) + "]");
+    mTileMouseLabel->setCaption("Mouse: " +
+            toString(mouseTileX) + ", " + toString(mouseTileY));
     mTileMouseLabel->adjustSize();
 
     Map *currentMap = engine->getCurrentMap();
-    if (currentMap != NULL)
+    if (currentMap)
     {
         const std::string music =
-            " [Music: " + currentMap->getProperty("music") + "]";
+            "Music: " + currentMap->getProperty("music");
         mMusicFileLabel->setCaption(music);
         mMusicFileLabel->adjustSize();
 
         const std::string minimap =
-            " [MiniMap: " + currentMap->getProperty("minimap") + "]";
+            "MiniMap: " + currentMap->getProperty("minimap");
         mMiniMapLabel->setCaption(minimap);
         mMiniMapLabel->adjustSize();
 
         const std::string map =
-            " [Map: " + currentMap->getProperty("_filename") + "]";
+            "Map: " + currentMap->getProperty("_filename");
         mMapLabel->setCaption(map);
         mMapLabel->adjustSize();
     }
 
-    mParticleCountLabel->setCaption("[Particle count: " +
-                                    toString(Particle::particleCount)
-                                    +"]");
+    mParticleCountLabel->setCaption("Particle count: " +
+                                    toString(Particle::particleCount));
     mParticleCountLabel->adjustSize();
 }