summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-12 13:54:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-12 13:54:02 +0300
commitc9d8a97059e24d24011870fae89199e1cb44e5ef (patch)
tree1319aa49a8e4fac0d8307e2393d45f62f99224cd /src/net/tmwa
parent3121b17f34cb74e1b54ef5bde8b3937627d79d91 (diff)
downloadplus-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.gz
plus-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.bz2
plus-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.xz
plus-c9d8a97059e24d24011870fae89199e1cb44e5ef.zip
Move GuildTab from net namespace into gui.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/generalhandler.cpp4
-rw-r--r--src/net/tmwa/guildhandler.cpp12
-rw-r--r--src/net/tmwa/guildhandler.h3
3 files changed, 10 insertions, 9 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9bd209354..fb64617a0 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -35,7 +35,7 @@
#include "net/ea/guildhandler.h"
-#include "net/ea/gui/guildtab.h"
+#include "gui/widgets/tabs/chat/guildtab.h"
#include "net/ea/gui/partytab.h"
#include "net/tmwa/adminhandler.h"
@@ -351,7 +351,7 @@ void GeneralHandler::gameEnded() const
socialWindow->removeTab(Ea::taParty);
}
- delete2(Ea::guildTab);
+ delete2(guildTab);
delete2(Ea::partyTab);
}
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index a22cd69b0..3e9faa4c8 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -32,7 +32,7 @@
#include "net/serverfeatures.h"
-#include "net/ea/gui/guildtab.h"
+#include "gui/widgets/tabs/chat/guildtab.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
@@ -360,11 +360,11 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const
g->setEmblemId(emblem);
if (!Ea::taGuild)
Ea::taGuild = g;
- if (!Ea::guildTab && chatWindow)
+ if (!guildTab && chatWindow)
{
- Ea::guildTab = new Ea::GuildTab(chatWindow);
+ guildTab = new GuildTab(chatWindow);
if (config.getBoolValue("showChatHistory"))
- Ea::guildTab->loadFromLogFile("#Guild");
+ guildTab->loadFromLogFile("#Guild");
if (localPlayer)
localPlayer->addGuild(Ea::taGuild);
memberList(guildId);
@@ -391,8 +391,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const
if (m)
{
m->setOnline(online);
- if (Ea::guildTab)
- Ea::guildTab->showOnline(m->getName(), online);
+ if (guildTab)
+ guildTab->showOnline(m->getName(), online);
if (socialWindow)
socialWindow->updateGuildCounter();
}
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 35f10bbbf..506de89dd 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -83,9 +83,10 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
void processGuildExpulsionList(Net::MessageIn &msg) const;
};
- extern Ea::GuildTab *guildTab;
} // namespace TmwAthena
+extern GuildTab *guildTab;
+
namespace Ea
{
extern Guild *taGuild;