From 8076d645b7a4271b9b5f100f5ea881891fea7d7c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 May 2017 01:22:28 +0300
Subject: Remove ServerFeatures::haveNativeGuilds and
 ServerFeatures::haveChatChannels.

---
 src/utils/chatutils.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index d80e8d761..dc43dc703 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -31,6 +31,7 @@
 
 #include "net/chathandler.h"
 #include "net/guildhandler.h"
+#include "net/net.h"
 #include "net/partyhandler.h"
 #include "net/serverfeatures.h"
 
@@ -67,17 +68,21 @@ void outStringNormal(ChatTab *const tab,
             const Guild *const guild = localPlayer->getGuild();
             if (guild)
             {
+#ifdef TMWA_SUPPORT
                 if (guild->getServerGuild())
                 {
-                    if (!serverFeatures->haveNativeGuilds())
+                    if (Net::getNetworkType() == ServerType::TMWATHENA)
                         return;
                     guildHandler->chat(str);
                 }
-#ifdef TMWA_SUPPORT
                 else if (guildManager)
                 {
                     guildManager->chat(str);
                 }
+#else  // TMWA_SUPPORT
+
+                if (guild->getServerGuild())
+                    guildHandler->chat(str);
 #endif  // TMWA_SUPPORT
             }
             break;
-- 
cgit v1.2.3-70-g09d2