summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 18:57:55 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 18:57:55 +0300
commit3c39535b77209f4afda43b689999a7e61a1e163b (patch)
tree1c3aedaf604710264e9b6c9b6d9a834d56a74f57
parent24b60886fd34770af1b97a36df72c58c4f73539f (diff)
downloadplus-3c39535b77209f4afda43b689999a7e61a1e163b.tar.gz
plus-3c39535b77209f4afda43b689999a7e61a1e163b.tar.bz2
plus-3c39535b77209f4afda43b689999a7e61a1e163b.tar.xz
plus-3c39535b77209f4afda43b689999a7e61a1e163b.zip
Remove ServerFeatures haveBankApi because it depend only on server type.
-rw-r--r--src/actions/windows.cpp5
-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, 4 insertions, 17 deletions
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 9d29b043c..c135ab541 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -51,6 +51,7 @@
#include "utils/gettext.h"
+#include "net/net.h"
#include "net/serverfeatures.h"
#include "debug.h"
@@ -266,8 +267,10 @@ impHandler0(questsWindowShow)
impHandler0(bankWindowShow)
{
- if (!serverFeatures || !serverFeatures->haveBankApi())
+#ifdef TMWA_SUPPORT
+ if (Net::getNetworkType() == ServerType::TMWATHENA)
return false;
+#endif // TMWA_SUPPORT
showHideWindow(bankWindow);
return true;
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 0cf04cc4a..e16e445e2 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -91,11 +91,6 @@ bool ServerFeatures::haveEmailOnDelete() const
return serverVersion > 0;
}
-bool ServerFeatures::haveBankApi() const
-{
- return true;
-}
-
bool ServerFeatures::haveServerVersion() const
{
return Net::getNetworkType() == ServerType::EVOL2;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index b372bfb8f..adb23d240 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -56,8 +56,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveEmailOnDelete() const override final;
- bool haveBankApi() const override final A_CONST;
-
bool haveServerVersion() const override final;
bool haveMapServerVersion() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 6cc6314ba..84db095d1 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -58,8 +58,6 @@ class ServerFeatures notfinal
virtual bool haveEmailOnDelete() const = 0;
- virtual bool haveBankApi() const = 0;
-
virtual bool haveServerVersion() const = 0;
virtual bool haveMapServerVersion() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 8e1453c9d..ba0d5f438 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -89,11 +89,6 @@ bool ServerFeatures::haveEmailOnDelete() const
return false;
}
-bool ServerFeatures::haveBankApi() const
-{
- return false;
-}
-
bool ServerFeatures::haveServerVersion() const
{
return true;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index edf3c2864..727a55a5c 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -56,8 +56,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveEmailOnDelete() const override final A_CONST;
- bool haveBankApi() const override final A_CONST;
-
bool haveServerVersion() const override final A_CONST;
bool haveMapServerVersion() const override final A_CONST;