diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:40:04 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-02-08 14:43:51 -0700 |
| commit | 8a31e96d8534d402db9cd48183c0b15732f7d95e (patch) | |
| tree | 885d83febf301c1289c3bf7f83bf9dca89e0347c /src/net/ea/generalhandler.cpp | |
| parent | bc5c031e43eff506c925682349dd2a52b89d6565 (diff) | |
| download | mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.gz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.bz2 mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.tar.xz mana-8a31e96d8534d402db9cd48183c0b15732f7d95e.zip | |
Merge PartyWindow and GuildWindow into SocialWindow
Diffstat (limited to 'src/net/ea/generalhandler.cpp')
| -rw-r--r-- | src/net/ea/generalhandler.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index 24bc79bb..547b0609 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -29,6 +29,7 @@ #include "gui/inventorywindow.h" #include "gui/register.h" #include "gui/skilldialog.h" +#include "gui/socialwindow.h" #include "gui/statuswindow.h" #include "net/ea/adminhandler.h" @@ -67,6 +68,8 @@ namespace EAthena { ServerInfo charServer; ServerInfo mapServer; +extern Party *eaParty; + GeneralHandler::GeneralHandler(): mAdminHandler(new AdminHandler), mBeingHandler(new BeingHandler(config.getValue("EnableSync", 0) == 1)), @@ -202,7 +205,6 @@ void GeneralHandler::flushNetwork() void GeneralHandler::guiWindowsLoaded() { - partyTab = new PartyTab; inventoryWindow->setSplitAllowed(false); skillDialog->loadSkills("ea-skills.xml"); @@ -224,8 +226,12 @@ void GeneralHandler::guiWindowsLoaded() void GeneralHandler::guiWindowsUnloaded() { - delete partyTab; - partyTab = 0; + socialWindow->removeTab(eaParty); + if (partyTab) + { + delete partyTab; + partyTab = 0; + } } void GeneralHandler::clearHandlers() |