From d8e382e49317adf9717d83509c6975f8958f5043 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 01:24:21 +0300 Subject: Remove ServerFeatures haveServerIgnore because it was used only in tmwa. --- src/net/eathena/serverfeatures.cpp | 5 ----- src/net/eathena/serverfeatures.h | 2 -- src/net/serverfeatures.h | 2 -- src/net/tmwa/chathandler.cpp | 8 -------- src/net/tmwa/serverfeatures.cpp | 5 ----- src/net/tmwa/serverfeatures.h | 2 -- 6 files changed, 24 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 95bdc764e..c305fafcf 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -66,11 +66,6 @@ bool ServerFeatures::haveLookSelection() const return serverVersion > 0; } -bool ServerFeatures::haveServerIgnore() const -{ - return true; -} - bool ServerFeatures::haveMove3() const { return serverVersion > 0; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 21725dfc5..97ceef268 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -46,8 +46,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveLookSelection() const override final; - bool haveServerIgnore() const override final A_CONST; - bool haveMove3() const override final; bool haveItemColors() const override final A_CONST; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 2755efbaa..83739b85f 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -48,8 +48,6 @@ class ServerFeatures notfinal virtual bool haveLookSelection() const = 0; - virtual bool haveServerIgnore() const = 0; - virtual bool haveMove3() const = 0; virtual bool haveItemColors() const = 0; diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 2abebf211..94bfa748c 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -180,18 +180,10 @@ void ChatHandler::processRaw(MessageOut &restrict outMsg, void ChatHandler::ignoreAll() const { - if (!serverFeatures->haveServerIgnore()) - return; - createOutPacket(CMSG_IGNORE_ALL); - outMsg.writeInt8(0, "flag"); } void ChatHandler::unIgnoreAll() const { - if (!serverFeatures->haveServerIgnore()) - return; - createOutPacket(CMSG_IGNORE_ALL); - outMsg.writeInt8(1, "flag"); } void ChatHandler::ignore(const std::string &nick) const diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 1363ac507..72841b374 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -64,11 +64,6 @@ bool ServerFeatures::haveLookSelection() const return false; } -bool ServerFeatures::haveServerIgnore() const -{ - return false; -} - bool ServerFeatures::haveMove3() const { return tmwServerVersion >= 0x0f0512 && tmwServerVersion <= 0xf0706; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index a252f3f61..c23b45f11 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -46,8 +46,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveLookSelection() const override final A_CONST; - bool haveServerIgnore() const override final; - bool haveMove3() const override final; bool haveItemColors() const override final A_CONST; -- cgit v1.2.3-60-g2f50