From 3db50047155e200c9ece17e711d7334e49aff84f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 23:13:33 +0300 Subject: Remove ServerFeatures haveFamily because in only depend on 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(-) (limited to 'src') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 4ef053039..33cbacfd2 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -3408,7 +3408,7 @@ void PopupMenu::addCatchPetCommands() void PopupMenu::showAdoptCommands() { - if (!serverFeatures->haveFamily()) + if (Net::getNetworkType() == ServerType::TMWATHENA) return; // TRANSLATORS: popup menu item // TRANSLATORS: adopt child command diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index bc7cd9daa..d7bf16bd0 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::haveFamily() const -{ - return true; -} - bool ServerFeatures::haveMoveWhileSit() const { return serverVersion > 0; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index de2f17c2d..f60f6e741 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 haveFamily() const override final; - bool haveMoveWhileSit() const override final; bool haveKillerId() const override final; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 96bf6fd57..aed1948c8 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 haveFamily() const = 0; - virtual bool haveMoveWhileSit() const = 0; virtual bool haveKillerId() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 220699048..0c7bca22e 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::haveFamily() const -{ - return false; -} - bool ServerFeatures::haveMoveWhileSit() const { return true; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index e5e404fd9..95371c1b3 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 haveFamily() const override final A_CONST; - bool haveMoveWhileSit() const override final A_CONST; bool haveKillerId() const override final A_CONST; -- cgit v1.2.3-60-g2f50