From 0e9ef0640cab30431bef8a4683a5da549d5c8f88 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Jul 2011 01:02:50 +0300 Subject: Extract shared logic from guildhandler and partyhandler netcode to ea namespace. --- src/net/tmwa/generalhandler.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/net/tmwa/generalhandler.cpp') 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; } } } -- cgit v1.2.3-60-g2f50