From a111555bd7dbb939673f25f1e8a1f211f61250ad Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Jun 2015 18:07:56 +0300 Subject: Remove server feature haveLangTab. --- src/game.cpp | 11 ----------- src/net/eathena/serverfeatures.cpp | 5 ----- src/net/eathena/serverfeatures.h | 2 -- src/net/serverfeatures.h | 2 -- src/net/tmwa/serverfeatures.cpp | 9 ++------- src/net/tmwa/serverfeatures.h | 2 -- 6 files changed, 2 insertions(+), 29 deletions(-) (limited to 'src') 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; -- cgit v1.2.3-70-g09d2