summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/guildmanager.cpp23
-rw-r--r--src/net/tmwa/serverfeatures.cpp10
-rw-r--r--src/net/tmwa/serverfeatures.h4
3 files changed, 8 insertions, 29 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)
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 8cd73884c..1363ac507 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -49,11 +49,6 @@ bool ServerFeatures::havePlayerStatusUpdate() const
return false;
}
-bool ServerFeatures::haveNativeGuilds() const
-{
- return false;
-}
-
bool ServerFeatures::haveIncompleteChatMessages() const
{
return tmwServerVersion <= 0x100209;
@@ -69,11 +64,6 @@ bool ServerFeatures::haveLookSelection() const
return false;
}
-bool ServerFeatures::haveChatChannels() const
-{
- return false;
-}
-
bool ServerFeatures::haveServerIgnore() const
{
return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 0f0b43547..a252f3f61 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -40,16 +40,12 @@ class ServerFeatures final : public Net::ServerFeatures
bool havePlayerStatusUpdate() const override final A_CONST;
- bool haveNativeGuilds() const override final;
-
bool haveIncompleteChatMessages() const override final;
bool haveRaceSelection() const override final A_CONST;
bool haveLookSelection() const override final A_CONST;
- bool haveChatChannels() const override final A_CONST;
-
bool haveServerIgnore() const override final;
bool haveMove3() const override final;