diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-01 01:22:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-01 02:37:10 +0300 |
| commit | 8076d645b7a4271b9b5f100f5ea881891fea7d7c (patch) | |
| tree | fecf49e032f39799a7f26fc069e13a06efe094af /src/utils | |
| parent | 21244eb0c558f5d33c9a07f28a5660690c77ef19 (diff) | |
| download | manaplus-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.gz manaplus-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.bz2 manaplus-8076d645b7a4271b9b5f100f5ea881891fea7d7c.tar.xz manaplus-8076d645b7a4271b9b5f100f5ea881891fea7d7c.zip | |
Remove ServerFeatures::haveNativeGuilds and ServerFeatures::haveChatChannels.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/chatutils.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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; |