From a12cecc9df169c16959ea3ddf3e22351e8248215 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 21:30:27 +0300 Subject: Remove ServerFeatures haveMute because it depend only server type. --- src/gui/popups/popupmenu.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/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 2082cbebf..0a938f6cb 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -3141,7 +3141,7 @@ void PopupMenu::showMuteCommands() mBrowserBox->addRow(strprintf(_("Mute %s"), mName.c_str())); if (mBeingId != BeingId_zero && - serverFeatures->haveMute()) + Net::getNetworkType() == ServerType::EATHENA) { mBrowserBox->addRow("mute_+1", // TRANSLATORS: popup menu item diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index d83f2803e..7ca6c3b27 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -131,11 +131,6 @@ bool ServerFeatures::haveServerWarpNames() const return serverVersion == 0; } -bool ServerFeatures::haveMute() const -{ - return true; -} - bool ServerFeatures::haveTeamId() const { return false; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 8fde10109..ce50ca6ca 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -72,8 +72,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveServerWarpNames() const override final; - bool haveMute() const override final A_CONST; - bool haveTeamId() const override final A_CONST; bool haveExtendedRiding() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index e80257eee..7b1fab08a 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -74,8 +74,6 @@ class ServerFeatures notfinal virtual bool haveServerWarpNames() const = 0; - virtual bool haveMute() const = 0; - virtual bool haveTeamId() const = 0; virtual bool haveExtendedRiding() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index cfd2f7c56..e7e523be6 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -129,11 +129,6 @@ bool ServerFeatures::haveServerWarpNames() const return false; } -bool ServerFeatures::haveMute() const -{ - return false; -} - bool ServerFeatures::haveTeamId() const { return true; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 1d7894b0c..5cf1be343 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -72,8 +72,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveServerWarpNames() const override final A_CONST; - bool haveMute() const override final A_CONST; - bool haveTeamId() const override final; bool haveExtendedRiding() const override final A_CONST; -- cgit v1.2.3-70-g09d2