From 570f7c9b66f9d0a11b7845a4c4d3bea0b7b7b628 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 22:32:09 +0300 Subject: Remove ServerFeatures haveMultyStatusUp because it depend only on server type. --- src/gui/widgets/attrs/changedisplay.cpp | 3 ++- 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, 2 insertions(+), 17 deletions(-) diff --git a/src/gui/widgets/attrs/changedisplay.cpp b/src/gui/widgets/attrs/changedisplay.cpp index 96a6a04d3..1f55563e4 100644 --- a/src/gui/widgets/attrs/changedisplay.cpp +++ b/src/gui/widgets/attrs/changedisplay.cpp @@ -30,6 +30,7 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/layouthelper.h" +#include "net/net.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -102,7 +103,7 @@ void ChangeDisplay::action(const ActionEvent &event) const int newbase = PlayerInfo::getStatBase(mId) + cnt; PlayerInfo::setStatBase(mId, newbase); - if (serverFeatures->haveMultyStatusUp()) + if (Net::getNetworkType() == ServerType::EATHENA) { playerHandler->increaseAttribute(mId, cnt); } diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 264c03b23..d488bae96 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -141,11 +141,6 @@ bool ServerFeatures::haveExtendedDropsPosition() const return serverVersion >= 12; } -bool ServerFeatures::haveMultyStatusUp() const -{ - return true; -} - bool ServerFeatures::haveMail() const { return true; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index d827d372d..2437cc39f 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -76,8 +76,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveExtendedDropsPosition() const override final; - bool haveMultyStatusUp() const override final; - bool haveMail() const override final; bool haveServerPets() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 1a0de93d2..56e3ddd0b 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -78,8 +78,6 @@ class ServerFeatures notfinal virtual bool haveExtendedDropsPosition() const = 0; - virtual bool haveMultyStatusUp() const = 0; - virtual bool haveMail() const = 0; virtual bool haveServerPets() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 54d86af40..511a2ddc7 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -139,11 +139,6 @@ bool ServerFeatures::haveExtendedDropsPosition() const return false; } -bool ServerFeatures::haveMultyStatusUp() const -{ - return false; -} - bool ServerFeatures::haveMail() const { return false; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index d609fa300..027aa9b5c 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -76,8 +76,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveExtendedDropsPosition() const override final A_CONST; - bool haveMultyStatusUp() const override final A_CONST; - bool haveMail() const override final A_CONST; bool haveServerPets() const override final A_CONST; -- cgit v1.2.3-70-g09d2