summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-20 18:07:56 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-20 18:07:56 +0300
commita111555bd7dbb939673f25f1e8a1f211f61250ad (patch)
tree7ceb5c0f929c0e87d17eec5624d6277d019863d6
parentea6ec430fe08e78ff88bc5021936a0f3655685a2 (diff)
downloadmanaplus-a111555bd7dbb939673f25f1e8a1f211f61250ad.tar.gz
manaplus-a111555bd7dbb939673f25f1e8a1f211f61250ad.tar.bz2
manaplus-a111555bd7dbb939673f25f1e8a1f211f61250ad.tar.xz
manaplus-a111555bd7dbb939673f25f1e8a1f211f61250ad.zip
Remove server feature haveLangTab.
-rw-r--r--src/game.cpp11
-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.cpp9
-rw-r--r--src/net/tmwa/serverfeatures.h2
6 files changed, 2 insertions, 29 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 00de21004..7dedb9700 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -256,17 +256,6 @@ static void createGuiWindows()
if (config.getBoolValue("showChatHistory"))
localChatTab->loadFromLogFile("#General");
- if (serverFeatures->haveLangTab()
- && serverConfig.getValue("enableLangTab", 1))
- {
- const std::string lang = getLangShort();
- if (lang.size() == 2)
- {
- langChatTab = new LangTab(chatWindow, lang + " ");
- langChatTab->setAllowHighlight(false);
- }
- }
-
// TRANSLATORS: chat tab header
debugChatTab = new ChatTab(chatWindow, _("Debug"), "",
"#Debug", ChatTabType::DEBUG);
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 79d2e10bf..1ea480e71 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -60,11 +60,6 @@ bool ServerFeatures::haveServerHp() const
return true;
}
-bool ServerFeatures::haveLangTab() const
-{
- return false;
-}
-
bool ServerFeatures::havePlayerStatusUpdate() const
{
return serverVersion >= 5;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 70faf70c3..459271068 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -44,8 +44,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerHp() const override final;
- bool haveLangTab() const override final;
-
bool havePlayerStatusUpdate() const override final;
bool haveBrokenPlayerAttackDistance() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 28ea97782..81146d7a7 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -41,8 +41,6 @@ class ServerFeatures notfinal
virtual bool haveServerHp() const = 0;
- virtual bool haveLangTab() const = 0;
-
virtual bool havePlayerStatusUpdate() const = 0;
virtual bool haveBrokenPlayerAttackDistance() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index de45ad52d..25d024e04 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -36,7 +36,7 @@ ServerFeatures::ServerFeatures()
bool ServerFeatures::haveServerOnlineList() const
{
- return serverVersion >= 3;
+ return false;
}
bool ServerFeatures::haveOnlineList() const
@@ -56,12 +56,7 @@ bool ServerFeatures::haveChangePartyLeader() const
bool ServerFeatures::haveServerHp() const
{
- return serverVersion > 0 || tmwServerVersion > 0x0f0513;
-}
-
-bool ServerFeatures::haveLangTab() const
-{
- return serverVersion >= 8;
+ return tmwServerVersion > 0x0f0513;
}
bool ServerFeatures::havePlayerStatusUpdate() const
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 0b8beab9a..383d048b4 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -44,8 +44,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerHp() const override final;
- bool haveLangTab() const override final;
-
bool havePlayerStatusUpdate() const override final;
bool haveBrokenPlayerAttackDistance() const override final;