From be513302d41da31a69f4661bab67b930612db967 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 Jul 2016 21:33:04 +0300 Subject: Remove completly support for tmwa version 0. --- src/net/eathena/serverfeatures.cpp | 5 ----- src/net/eathena/serverfeatures.h | 2 -- src/net/serverfeatures.h | 2 -- src/net/tmwa/serverfeatures.cpp | 11 +++-------- src/net/tmwa/serverfeatures.h | 2 -- 5 files changed, 3 insertions(+), 19 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 40916a4bf..a0c9c7780 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -235,11 +235,6 @@ bool ServerFeatures::haveTeamId() const return false; } -bool ServerFeatures::haveNewGuild() const -{ - return false; -} - bool ServerFeatures::haveAdvancedSprites() const { return serverVersion >= 7; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index de918f2ef..e09cf9117 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -114,8 +114,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveTeamId() const override final A_CONST; - bool haveNewGuild() const override final A_CONST; - bool haveAdvancedSprites() const override final; bool haveExtendedRiding() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index b3976984e..aa5902bb0 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -111,8 +111,6 @@ class ServerFeatures notfinal virtual bool haveTeamId() const = 0; - virtual bool haveNewGuild() const = 0; - virtual bool haveAdvancedSprites() const = 0; virtual bool haveExtendedRiding() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index d1415be72..e9615a68a 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -75,7 +75,7 @@ bool ServerFeatures::haveNativeGuilds() const bool ServerFeatures::haveIncompleteChatMessages() const { - return tmwServerVersion > 0 && tmwServerVersion <= 0x100209; + return tmwServerVersion <= 0x100209; } bool ServerFeatures::haveRaceSelection() const @@ -95,7 +95,7 @@ bool ServerFeatures::haveChatChannels() const bool ServerFeatures::haveServerIgnore() const { - return tmwServerVersion == 0; + return false; } bool ServerFeatures::haveMove3() const @@ -230,12 +230,7 @@ bool ServerFeatures::haveChangePassword() const bool ServerFeatures::haveTeamId() const { - return tmwServerVersion > 0; -} - -bool ServerFeatures::haveNewGuild() const -{ - return tmwServerVersion > 0; + return true; } bool ServerFeatures::haveAdvancedSprites() const diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 4f5fb5a14..10f328077 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -114,8 +114,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveTeamId() const override final; - bool haveNewGuild() const override final; - bool haveAdvancedSprites() const override final A_CONST; bool haveExtendedRiding() const override final A_CONST; -- cgit v1.2.3-70-g09d2