summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-02-10 01:25:51 +0300
committerAndrei Karas <akaras@inbox.ru>2018-02-11 04:28:43 +0300
commit219afd10cf1dc8f7e75273706c2de3a06305e637 (patch)
tree5e1be1c457016104c5ea9bbf0d07ee2f491ef9d8 /src/progs
parentbdf970bde1ce41aa364fc0065ac0cd23e37ec29f (diff)
downloadplus-219afd10cf1dc8f7e75273706c2de3a06305e637.tar.gz
plus-219afd10cf1dc8f7e75273706c2de3a06305e637.tar.bz2
plus-219afd10cf1dc8f7e75273706c2de3a06305e637.tar.xz
plus-219afd10cf1dc8f7e75273706c2de3a06305e637.zip
Add basic support for clans.
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/manaplus/actions/chat.cpp7
-rw-r--r--src/progs/manaplus/actions/windows.cpp2
-rw-r--r--src/progs/manaplus/client.cpp2
3 files changed, 11 insertions, 0 deletions
diff --git a/src/progs/manaplus/actions/chat.cpp b/src/progs/manaplus/actions/chat.cpp
index 0644f9c02..bbfefc826 100644
--- a/src/progs/manaplus/actions/chat.cpp
+++ b/src/progs/manaplus/actions/chat.cpp
@@ -36,6 +36,7 @@
#include "net/charserverhandler.h"
#include "net/chathandler.h"
+#include "net/clanhandler.h"
#include "net/guildhandler.h"
#include "net/net.h"
#include "net/partyhandler.h"
@@ -74,6 +75,12 @@ static void outString(ChatTab *const tab,
switch (tab->getType())
{
+ case ChatTabType::CLAN:
+ {
+ if (clanHandler != nullptr)
+ clanHandler->chat(str);
+ break;
+ }
case ChatTabType::PARTY:
{
if (partyHandler != nullptr)
diff --git a/src/progs/manaplus/actions/windows.cpp b/src/progs/manaplus/actions/windows.cpp
index 816a1952d..7368ec287 100644
--- a/src/progs/manaplus/actions/windows.cpp
+++ b/src/progs/manaplus/actions/windows.cpp
@@ -133,6 +133,8 @@ impHandler(helpWindowShow)
return showHelpPage("chatgm", true);
case ChatTabType::CHANNEL:
return showHelpPage("chatchannel", true);
+ case ChatTabType::CLAN:
+ return showHelpPage("chatclan", true);
default:
case ChatTabType::UNKNOWN:
case ChatTabType::INPUT:
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 5946f01d5..f1273c7a1 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -34,6 +34,7 @@
#include "soundmanager.h"
#include "spellmanager.h"
+#include "being/claninfo.h"
#include "being/localplayer.h"
#include "being/playerinfo.h"
#include "being/playerrelations.h"
@@ -1985,6 +1986,7 @@ void Client::unloadData()
ResourceManager::clearCache();
loginData.clearUpdateHost();
+ clanInfo.clear();
serverVersion = 0;
packetVersion = 0;
tmwServerVersion = 0;