summaryrefslogtreecommitdiff
path: root/src/net/tmwa/generalhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-30 01:02:50 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-30 05:02:46 +0300
commit0e9ef0640cab30431bef8a4683a5da549d5c8f88 (patch)
treeb3866e49869019a3278a71290fc78209bac51972 /src/net/tmwa/generalhandler.cpp
parentc8b18b47abbb325b6cc4b34abbad52b03825e4f9 (diff)
downloadmv-0e9ef0640cab30431bef8a4683a5da549d5c8f88.tar.gz
mv-0e9ef0640cab30431bef8a4683a5da549d5c8f88.tar.bz2
mv-0e9ef0640cab30431bef8a4683a5da549d5c8f88.tar.xz
mv-0e9ef0640cab30431bef8a4683a5da549d5c8f88.zip
Extract shared logic from guildhandler and partyhandler netcode to ea namespace.
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
-rw-r--r--src/net/tmwa/generalhandler.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 7993c24dc..3e46fa66b 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -37,6 +37,11 @@
#include "net/messageout.h"
#include "net/serverinfo.h"
+#include "net/ea/guildhandler.h"
+
+#include "net/ea/gui/guildtab.h"
+#include "net/ea/gui/partytab.h"
+
#include "net/tmwa/adminhandler.h"
#include "net/tmwa/beinghandler.h"
#include "net/tmwa/buysellhandler.h"
@@ -75,9 +80,6 @@ namespace TmwAthena
ServerInfo charServer;
ServerInfo mapServer;
-extern Guild *taGuild;
-extern Party *taParty;
-
GeneralHandler::GeneralHandler():
mAdminHandler(new AdminHandler),
mBeingHandler(new BeingHandler(config.getBoolValue("EnableSync"))),
@@ -282,15 +284,15 @@ void GeneralHandler::event(Mana::Channels channel,
{
if (socialWindow)
{
- socialWindow->removeTab(taGuild);
- socialWindow->removeTab(taParty);
+ socialWindow->removeTab(Ea::taGuild);
+ socialWindow->removeTab(Ea::taParty);
}
- delete guildTab;
- guildTab = 0;
+ delete Ea::guildTab;
+ Ea::guildTab = 0;
- delete partyTab;
- partyTab = 0;
+ delete Ea::partyTab;
+ Ea::partyTab = 0;
}
}
}