Remove ServerFeatures haveCharRename because it depend only on server type.

6 files changed, 4 insertions, 17 deletions

diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index f7edbfc24..a2c40de7f 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -45,6 +45,7 @@
 #include "net/character.h"
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
+#include "net/net.h"
 #include "net/serverfeatures.h"
 
 #include "resources/db/unitsdb.h"
@@ -99,7 +100,9 @@ CharSelectDialog::CharSelectDialog(LoginData &data) :
     n ++;
     placer(n, 0, mDeleteButton);
     n ++;
-    if (serverFeatures->haveCharRename())
+#ifdef TMWA_SUPPORT
+    if (Net::getNetworkType() == ServerType::EATHENA)
+#endif
     {
         mRenameButton = new Button(this,
             // TRANSLATORS: character rename button
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index bd33ec0c3..0cf04cc4a 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::haveCharRename() const
-{
-    return true;
-}
-
 bool ServerFeatures::haveBankApi() const
 {
     return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 52511ea74..b372bfb8f 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 haveCharRename() const override final A_CONST;
-
         bool haveBankApi() const override final A_CONST;
 
         bool haveServerVersion() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 391edf9f2..6cc6314ba 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 haveCharRename() const = 0;
-
         virtual bool haveBankApi() const = 0;
 
         virtual bool haveServerVersion() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index bf0f370b1..8e1453c9d 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::haveCharRename() const
-{
-    return false;
-}
-
 bool ServerFeatures::haveBankApi() const
 {
     return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index b21faf69a..edf3c2864 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 haveCharRename() const override final A_CONST;
-
         bool haveBankApi() const override final A_CONST;
 
         bool haveServerVersion() const override final A_CONST;