From e4bb6a1c4841c263878291915c528de77042bba5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Dec 2016 00:45:28 +0300 Subject: Drop support for evol plugin version 5. --- src/net/eathena/loginhandler.cpp | 2 +- src/net/eathena/serverfeatures.cpp | 5 ----- src/net/eathena/serverfeatures.h | 2 -- src/net/serverfeatures.h | 2 -- src/net/tmwa/serverfeatures.cpp | 5 ----- src/net/tmwa/serverfeatures.h | 2 -- 6 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 9541bc291..7cbcf49cc 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -87,7 +87,7 @@ void LoginHandler::changePassword(const std::string &restrict oldPassword, const std::string &restrict newPassword) const { - if (!serverFeatures->haveChangePassword()) + if (serverVersion == 0) return; createOutPacket(CMSG_CHAR_PASSWORD_CHANGE); outMsg.writeStringNoLog(oldPassword, 24, "old password"); diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 4c24e088e..32e0d18e2 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -230,11 +230,6 @@ bool ServerFeatures::haveMute() const return true; } -bool ServerFeatures::haveChangePassword() const -{ - return serverVersion >= 6; -} - bool ServerFeatures::haveTeamId() const { return false; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 4d07c12b4..7e4d5b392 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -112,8 +112,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveMute() const override final A_CONST; - bool haveChangePassword() const override final; - bool haveTeamId() const override final A_CONST; bool haveAdvancedSprites() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 8f7959470..caadb15b4 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -109,8 +109,6 @@ class ServerFeatures notfinal virtual bool haveMute() const = 0; - virtual bool haveChangePassword() const = 0; - virtual bool haveTeamId() const = 0; virtual bool haveAdvancedSprites() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index c33030ca1..21307d5b3 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -228,11 +228,6 @@ bool ServerFeatures::haveMute() const return false; } -bool ServerFeatures::haveChangePassword() const -{ - return true; -} - bool ServerFeatures::haveTeamId() const { return true; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 7cde29acc..7fe6458b8 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -112,8 +112,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveMute() const override final A_CONST; - bool haveChangePassword() const override final A_CONST; - bool haveTeamId() const override final; bool haveAdvancedSprites() const override final A_CONST; -- cgit v1.2.3-60-g2f50