diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/windows/chatwindow.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/chathandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/eathena/chathandler.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index b21930bd0..a2b1781bf 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -200,7 +200,7 @@ class ChatWindow final : public Window, WhisperTab *getWhisperTab(const std::string &nick) const A_WARN_UNUSED; ChannelTab *addChannelTab(const std::string &name, - const bool switchTo = false) A_WARN_UNUSED; + const bool switchTo = false); ChatTab *addChatTab(const std::string &name, const bool switchTo, diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 0a5029b6e..d16692cf5 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -406,8 +406,7 @@ void ChatHandler::processColorChat(Net::MessageIn &msg) processChatContinue(message, ChatMsgType::BY_UNKNOWN); } -std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg, - ChatMsgType::Type &own) +std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg) { std::string msg = chatMsg; std::string channel(GENERAL_CHANNEL); @@ -425,7 +424,7 @@ std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg, void ChatHandler::processChatContinue(std::string chatMsg, ChatMsgType::Type own) { - const std::string channel = extractChannelFromMessage(chatMsg, own); + const std::string channel = extractChannelFromMessage(chatMsg); bool allow(true); if (chatWindow) { diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index 93cb77935..6bcf315bd 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -83,8 +83,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler const std::string &password) const override final; protected: - static std::string extractChannelFromMessage(std::string &chatMsg, - ChatMsgType::Type &own); + static std::string extractChannelFromMessage(std::string &chatMsg); void processChat(Net::MessageIn &msg); |