summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-26 16:57:05 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-27 05:37:27 +0300
commit12bf548533867a2eb3a1c354b778ef7f9157322a (patch)
tree3cb6f61396f00a5d3fa280ecd9d99f309f06f4ca /src/net/ea
parent2e7bfc350d38e16b3d340f8e4ea69e6ff6748f5c (diff)
downloadplus-12bf548533867a2eb3a1c354b778ef7f9157322a.tar.gz
plus-12bf548533867a2eb3a1c354b778ef7f9157322a.tar.bz2
plus-12bf548533867a2eb3a1c354b778ef7f9157322a.tar.xz
plus-12bf548533867a2eb3a1c354b778ef7f9157322a.zip
Basic support for guild bot integration.
Not working context menu actions, chat commands, auto complete.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/chathandler.cpp7
-rw-r--r--src/net/ea/guildhandler.cpp1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index c188a2204..e430dfc0f 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -25,6 +25,7 @@
#include "actorspritemanager.h"
#include "being.h"
#include "configuration.h"
+#include "guildmanager.h"
#include "localplayer.h"
#include "playerrelations.h"
#include "logger.h"
@@ -161,6 +162,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
if (nick != "Server")
{
+ if (guildManager && guildManager->getEnableGuildBot()
+ && nick == "guild" && guildManager->processGuildMessage(chatMsg))
+ {
+ return;
+ }
+
if (player_relations.hasPermission(
nick, PlayerRelation::WHISPER))
{
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 0210a76ff..2accb1f1d 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -125,6 +125,7 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg)
if (!guildTab && chatWindow)
{
guildTab = new GuildTab();
+ guildTab->loadFromLogFile("#Guild");
if (player_node)
player_node->addGuild(taGuild);
memberList(guildId);