1 files changed, 15 insertions, 4 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index ca6b4010..72dfbce5 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  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
@@ -51,7 +50,12 @@ extern Window *helpWindow;
 extern Window *debugWindow;
 extern Window *itemShortcutWindow;
 extern Window *emoteShortcutWindow;
+#ifdef TMWSERV_SUPPORT
+extern Window *magicDialog;
+extern Window *guildWindow;
+#else
 extern Window *storageWindow;
+#endif
 
 Setup::Setup():
     Window(_("Setup"))
@@ -108,7 +112,7 @@ Setup::Setup():
 
     add(panel);
 
-    setLocationRelativeTo(getParent());
+    center();
 
     setInGame(false);
 }
@@ -141,7 +145,9 @@ void Setup::action(const gcn::ActionEvent &event)
         statusWindow->resetToDefaultSize();
         buyDialog->resetToDefaultSize();
         sellDialog->resetToDefaultSize();
+#ifdef EATHENA_SUPPORT
         buySellDialog->resetToDefaultSize();
+#endif
         inventoryWindow->resetToDefaultSize();
         emoteWindow->resetToDefaultSize();
         npcTextDialog->resetToDefaultSize();
@@ -154,7 +160,12 @@ void Setup::action(const gcn::ActionEvent &event)
         debugWindow->resetToDefaultSize();
         itemShortcutWindow->resetToDefaultSize();
         emoteShortcutWindow->resetToDefaultSize();
+#ifdef TMWSERV_SUPPORT
+        magicDialog->resetToDefaultSize();
+        guildWindow->resetToDefaultSize();
+#else
         storageWindow->resetToDefaultSize();
+#endif
     }
 }