summaryrefslogtreecommitdiff
path: root/src/net/tmwa/guildmanager.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/net/tmwa/guildmanager.cpp
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/net/tmwa/guildmanager.cpp')
-rw-r--r--src/net/tmwa/guildmanager.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index c8aa27690..6e22de6ac 100644
--- a/src/net/tmwa/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -72,23 +72,16 @@ GuildManager::~GuildManager()
void GuildManager::init()
{
- if (serverFeatures->haveNativeGuilds())
+ int val = serverConfig.getValue("enableGuildBot", -1);
+ if (val == -1)
{
- mEnableGuildBot = false;
- }
- else
- {
- int val = serverConfig.getValue("enableGuildBot", -1);
- if (val == -1)
- {
- if (client->isTmw())
- val = 1;
- else
- val = 0;
- serverConfig.setValue("enableGuildBot", val);
- }
- mEnableGuildBot = val;
+ if (client->isTmw())
+ val = 1;
+ else
+ val = 0;
+ serverConfig.setValue("enableGuildBot", val);
}
+ mEnableGuildBot = val;
if (mEnableGuildBot)
{
if (!guildManager)