summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 0a938f6cb..630ec70b6 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -3389,7 +3389,7 @@ void PopupMenu::showCraftPopup()
void PopupMenu::addMailCommands()
{
- if (!serverFeatures->haveMail())
+ if (Net::getNetworkType() == ServerType::TMWATHENA)
return;
// TRANSLATORS: popup menu item
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index d488bae96..57dac8555 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::haveMail() const
-{
- return true;
-}
-
bool ServerFeatures::haveServerPets() const
{
return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 2437cc39f..fbd2e7992 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 haveMail() const override final;
-
bool haveServerPets() const override final;
bool haveFamily() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 56e3ddd0b..2f466a310 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 haveMail() const = 0;
-
virtual bool haveServerPets() const = 0;
virtual bool haveFamily() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 511a2ddc7..f68ef11de 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::haveMail() const
-{
- return false;
-}
-
bool ServerFeatures::haveServerPets() const
{
return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 027aa9b5c..04f178c16 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 haveMail() const override final A_CONST;
-
bool haveServerPets() const override final A_CONST;
bool haveFamily() const override final A_CONST;