summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 23:13:33 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 23:13:33 +0300
commit3db50047155e200c9ece17e711d7334e49aff84f (patch)
treecc6aaf717c427cf76012bc57d047bdafa22ea184
parentb074109077e850b3f015fe6e60f320d4c64d23b2 (diff)
downloadmv-3db50047155e200c9ece17e711d7334e49aff84f.tar.gz
mv-3db50047155e200c9ece17e711d7334e49aff84f.tar.bz2
mv-3db50047155e200c9ece17e711d7334e49aff84f.tar.xz
mv-3db50047155e200c9ece17e711d7334e49aff84f.zip
Remove ServerFeatures haveFamily because in only depend on server type.
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/net/eathena/serverfeatures.cpp5
-rw-r--r--src/net/eathena/serverfeatures.h2
-rw-r--r--src/net/serverfeatures.h2
-rw-r--r--src/net/tmwa/serverfeatures.cpp5
-rw-r--r--src/net/tmwa/serverfeatures.h2
6 files changed, 1 insertions, 17 deletions
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;