summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-31 03:22:28 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-31 03:22:28 +0000
commit0e6385c12f325fa77ad57eba9b578de10d505ff7 (patch)
tree54fa3fac0123f7bd0c47b1a2b27c38fe3b3bfc40
parentbe1f90d40f50eb67fa641bd55e109af8338239c7 (diff)
downloadmana-0e6385c12f325fa77ad57eba9b578de10d505ff7.tar.gz
mana-0e6385c12f325fa77ad57eba9b578de10d505ff7.tar.bz2
mana-0e6385c12f325fa77ad57eba9b578de10d505ff7.tar.xz
mana-0e6385c12f325fa77ad57eba9b578de10d505ff7.zip
Cleanup.
-rw-r--r--ChangeLog1
-rw-r--r--src/gui/setup.cpp15
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index da605661..83f8d126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2006-01-31 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/gui/setup.cpp: Cleanup.
* src/gui/requesttrade.cpp, src/gui/requesttrade.h: Made
RequestTradeDialog inherit from ConfirmDialog.
* src/Makefile.am, src/gui/buy.cpp, src/gui/buy.h, src/gui/sell.cpp,
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index cbb9d599..15ef9092 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -29,18 +29,11 @@
#include <guichan/widgets/label.hpp>
#include "button.h"
-#include "chat.h"
#include "checkbox.h"
-#include "equipmentwindow.h"
-#include "help.h"
-#include "inventorywindow.h"
#include "listbox.h"
#include "ok_dialog.h"
-#include "minimap.h"
#include "scrollarea.h"
-#include "skill.h"
#include "slider.h"
-#include "status.h"
#include "tabbedcontainer.h"
#include "../configuration.h"
@@ -55,6 +48,14 @@ extern SDL_Joystick *joypad;
extern SDL_Joystick *joypad;
+extern Window *statusWindow;
+extern Window *minimap;
+extern Window *chatWindow;
+extern Window *inventoryWindow;
+extern Window *equipmentWindow;
+extern Window *helpWindow;
+extern Window *skillDialog;
+
ModeListModel::ModeListModel()
{
SDL_Rect **modes;