summaryrefslogtreecommitdiff
path: root/src/gui/windows/chatwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 01:22:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 02:37:10 +0300
commit8076d645b7a4271b9b5f100f5ea881891fea7d7c (patch)
treefecf49e032f39799a7f26fc069e13a06efe094af /src/gui/windows/chatwindow.cpp
parent21244eb0c558f5d33c9a07f28a5660690c77ef19 (diff)
downloadmv-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.gz
mv-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.bz2
mv-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.xz
mv-8076d645b7a4271b9b5f100f5ea881891fea7d7c.zip
Remove ServerFeatures::haveNativeGuilds and ServerFeatures::haveChatChannels.
Diffstat (limited to 'src/gui/windows/chatwindow.cpp')
-rw-r--r--src/gui/windows/chatwindow.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 6e4cb591e..da4a256a1 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -71,6 +71,7 @@
#include "resources/db/textdb.h"
#include "net/chathandler.h"
+#include "net/net.h"
#include "net/serverfeatures.h"
#include "utils/copynpaste.h"
@@ -1299,8 +1300,9 @@ ChatTab *ChatWindow::addChatTab(const std::string &name,
const bool switchTo,
const bool join)
{
- if (serverFeatures->haveChatChannels() && name.size() > 1
- && name[0] == '#')
+ if (Net::getNetworkType() == ServerType::EATHENA &&
+ name.size() > 1 &&
+ name[0] == '#')
{
ChatTab *const tab = addChannelTab(name, switchTo);
if (tab && join)
@@ -1696,7 +1698,7 @@ bool ChatWindow::resortChatLog(std::string line,
tryRemoveColors);
}
}
- else if (serverFeatures->haveChatChannels())
+ else if (Net::getNetworkType() == ServerType::EATHENA)
{
channelChatLog(channel, line, own, ignoreRecord, tryRemoveColors);
return false;