summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-08-10 20:34:17 -0600
committerJared Adams <jaxad0127@gmail.com>2009-08-10 20:36:22 -0600
commit1b13d8557c8666e1017fd70a455830dbdcb9f46c (patch)
tree59ac497717ee78861d6e2dc64a35f4924efb8947 /src/game.cpp
parent9af6e761373f25b56e815f1f75b44473474cf280 (diff)
downloadmana-1b13d8557c8666e1017fd70a455830dbdcb9f46c.tar.gz
mana-1b13d8557c8666e1017fd70a455830dbdcb9f46c.tar.bz2
mana-1b13d8557c8666e1017fd70a455830dbdcb9f46c.tar.xz
mana-1b13d8557c8666e1017fd70a455830dbdcb9f46c.zip
Add SpecialsWindow
THis replaces the MagicWindow that the TMWServ build used and will be usable going forward for eAthena.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp
index ff0d84f7..2acb8bc2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -71,10 +71,10 @@
#ifdef TMWSERV_SUPPORT
#include "gui/buddywindow.h"
#include "gui/guildwindow.h"
-#include "gui/magic.h"
#include "gui/quitdialog.h"
#endif
#include "gui/npcpostdialog.h"
+#include "gui/specialswindow.h"
#include "gui/storagewindow.h"
#include "net/generalhandler.h"
@@ -128,7 +128,6 @@ PartyWindow *partyWindow;
#ifdef TMWSERV_SUPPORT
BuddyWindow *buddyWindow;
GuildWindow *guildWindow;
-MagicDialog *magicDialog;
#endif
NpcDialog *npcDialog;
NpcPostDialog *npcPostDialog;
@@ -141,6 +140,7 @@ DebugWindow *debugWindow;
ShortcutWindow *itemShortcutWindow;
ShortcutWindow *emoteShortcutWindow;
OutfitWindow *outfitWindow;
+SpecialsWindow *specialsWindow;
BeingManager *beingManager = NULL;
FloorItemManager *floorItemManager = NULL;
@@ -215,7 +215,6 @@ static void createGuiWindows()
tradeWindow = new TradeWindow;
partyWindow = new PartyWindow;
#ifdef TMWSERV_SUPPORT
- magicDialog = new MagicDialog;
buddyWindow = new BuddyWindow;
guildWindow = new GuildWindow;
#else
@@ -237,6 +236,7 @@ static void createGuiWindows()
emoteShortcutWindow = new ShortcutWindow("EmoteShortcut",
new EmoteShortcutContainer);
outfitWindow = new OutfitWindow();
+ specialsWindow = new SpecialsWindow();
localChatTab = new ChatTab(_("General"));
@@ -269,7 +269,6 @@ static void destroyGuiWindows()
delete npcDialog;
delete npcPostDialog;
#ifdef TMWSERV_SUPPORT
- delete magicDialog;
delete buddyWindow;
delete guildWindow;
#endif
@@ -283,6 +282,7 @@ static void destroyGuiWindows()
delete emoteShortcutWindow;
delete storageWindow;
delete outfitWindow;
+ delete specialsWindow;
}
Game::Game():