summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 23:09:24 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 23:09:24 +0300
commitb074109077e850b3f015fe6e60f320d4c64d23b2 (patch)
tree8c1051fe03f04921e12ee5b1c1c641a4f4ed96d4 /src
parentfdebcc70f7d9559f03ffef94b8d03eba78294276 (diff)
downloadmv-b074109077e850b3f015fe6e60f320d4c64d23b2.tar.gz
mv-b074109077e850b3f015fe6e60f320d4c64d23b2.tar.bz2
mv-b074109077e850b3f015fe6e60f320d4c64d23b2.tar.xz
mv-b074109077e850b3f015fe6e60f320d4c64d23b2.zip
Remove ServerFeatures haveServerPets because depend only on server type.
Diffstat (limited to 'src')
-rw-r--r--src/gui/popups/popupmenu.cpp4
-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, 2 insertions, 18 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 630ec70b6..4ef053039 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1139,7 +1139,7 @@ void PopupMenu::showEmoteType()
// TRANSLATORS: show emotes for pet
mBrowserBox->addRow("/setemotetype pet", _("Pet"));
- if (serverFeatures->haveServerPets())
+ if (Net::getNetworkType() == ServerType::EATHENA)
{
// TRANSLATORS: popup menu item
// TRANSLATORS: show emotes for homuncules
@@ -3399,7 +3399,7 @@ void PopupMenu::addMailCommands()
void PopupMenu::addCatchPetCommands()
{
- if (!serverFeatures->haveServerPets())
+ if (Net::getNetworkType() == ServerType::TMWATHENA)
return;
// TRANSLATORS: popup menu item
// TRANSLATORS: catch pet command
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 57dac8555..bc7cd9daa 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::haveServerPets() const
-{
- return true;
-}
-
bool ServerFeatures::haveFamily() const
{
return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index fbd2e7992..de2f17c2d 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 haveServerPets() const override final;
-
bool haveFamily() const override final;
bool haveMoveWhileSit() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 2f466a310..96bf6fd57 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 haveServerPets() const = 0;
-
virtual bool haveFamily() const = 0;
virtual bool haveMoveWhileSit() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index f68ef11de..220699048 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::haveServerPets() const
-{
- return false;
-}
-
bool ServerFeatures::haveFamily() const
{
return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 04f178c16..e5e404fd9 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 haveServerPets() const override final A_CONST;
-
bool haveFamily() const override final A_CONST;
bool haveMoveWhileSit() const override final A_CONST;