summaryrefslogtreecommitdiff
path: root/src/gui
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
parent21244eb0c558f5d33c9a07f28a5660690c77ef19 (diff)
downloadManaVerse-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.gz
ManaVerse-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.bz2
ManaVerse-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.xz
ManaVerse-8076d645b7a4271b9b5f100f5ea881891fea7d7c.zip
Remove ServerFeatures::haveNativeGuilds and ServerFeatures::haveChatChannels.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/widgets/tabs/chat/chattab.cpp3
-rw-r--r--src/gui/windows/chatwindow.cpp8
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 450dcee1d..370700f48 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -3430,7 +3430,7 @@ void PopupMenu::addSocialMenu()
mBrowserBox->addRow("/createparty", _("Create party"));
}
- if (serverFeatures->haveNativeGuilds())
+ if (Net::getNetworkType() == ServerType::EATHENA)
{
const Guild *const guild = localPlayer->getGuild();
if (guild)
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 0a8d38355..9010d1406 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -44,6 +44,7 @@
#include "input/inputmanager.h"
#include "net/chathandler.h"
+#include "net/net.h"
#include "net/serverfeatures.h"
#include "utils/chatutils.h"
@@ -224,7 +225,7 @@ void ChatTab::chatLog(std::string line,
}
// if configured, move magic messages log to debug chat tab
- if (!serverFeatures->haveChatChannels()
+ if (Net::getNetworkType() == ServerType::TMWATHENA
&& localChatTab && this == localChatTab
&& ((config.getBoolValue("showMagicInDebug")
&& own == ChatMsgType::BY_PLAYER
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;