diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-28 18:13:57 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-28 18:13:57 -0600 |
commit | 088c0e4680d8013f01bdc70ac4f340f98afa2394 (patch) | |
tree | d3a103c962d8c8569bfab982882953e91326da65 /src/game.cpp | |
parent | d7ffc90de680965edef7aa432d3bc3fd15986850 (diff) | |
download | mana-client-088c0e4680d8013f01bdc70ac4f340f98afa2394.tar.gz mana-client-088c0e4680d8013f01bdc70ac4f340f98afa2394.tar.bz2 mana-client-088c0e4680d8013f01bdc70ac4f340f98afa2394.tar.xz mana-client-088c0e4680d8013f01bdc70ac4f340f98afa2394.zip |
Clean up eAthena party handling a bit more
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/game.cpp b/src/game.cpp index 2dc62b05..20bf1af1 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -74,12 +74,12 @@ #include "gui/status.h" #include "gui/trade.h" #include "gui/viewport.h" +#include "gui/partywindow.h" #ifdef TMWSERV_SUPPORT #include "gui/buddywindow.h" #include "gui/guildwindow.h" #include "gui/magic.h" #include "gui/npcpostdialog.h" -#include "gui/partywindow.h" #include "gui/quitdialog.h" #else #include "gui/storagewindow.h" @@ -107,7 +107,6 @@ #include "net/ea/inventoryhandler.h" #include "net/ea/itemhandler.h" #include "net/ea/npchandler.h" -#include "net/ea/party.h" #include "net/ea/playerhandler.h" #include "net/ea/tradehandler.h" #include "net/ea/protocol.h" @@ -155,12 +154,12 @@ NpcListDialog *npcListDialog; NpcTextDialog *npcTextDialog; NpcStringDialog *npcStringDialog; SkillDialog *skillDialog; +PartyWindow *partyWindow; #ifdef TMWSERV_SUPPORT BuddyWindow *buddyWindow; GuildWindow *guildWindow; MagicDialog *magicDialog; NpcPostDialog *npcPostDialog; -PartyWindow *partyWindow; #else StorageWindow *storageWindow; #endif @@ -180,9 +179,6 @@ Particle *particleEngine = NULL; EffectManager *effectManager = NULL; ChatTab *localChatTab = NULL; -#ifdef EATHENA_SUPPORT -Party *playerParty = NULL; -#endif const int MAX_TIME = 10000; @@ -248,13 +244,13 @@ static void createGuiWindows() npcIntegerDialog = new NpcIntegerDialog; npcListDialog = new NpcListDialog; npcStringDialog = new NpcStringDialog; + partyWindow = new PartyWindow; #ifdef TMWSERV_SUPPORT npcPostDialog = new NpcPostDialog; magicDialog = new MagicDialog; equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); buddyWindow = new BuddyWindow; guildWindow = new GuildWindow; - partyWindow = new PartyWindow; #else buySellDialog = new BuySellDialog; equipmentWindow = new EquipmentWindow; @@ -333,12 +329,12 @@ static void destroyGuiWindows() delete npcListDialog; delete npcTextDialog; delete npcStringDialog; + delete partyWindow; #ifdef TMWSERV_SUPPORT delete npcPostDialog; delete magicDialog; delete buddyWindow; delete guildWindow; - delete partyWindow; #endif delete skillDialog; delete minimap; @@ -401,9 +397,6 @@ Game::Game(Network *network): // Initialize beings beingManager->setPlayer(player_node); -#ifdef EATHENA_SUPPORT - playerParty = new Party; -#endif Joystick::init(); // TODO: The user should be able to choose which one to use @@ -459,8 +452,6 @@ Game::~Game() { #ifdef TMWSERV_SUPPORT Net::clearHandlers(); -#else - delete playerParty; #endif destroyGuiWindows(); |