From ee5643e7412f366241568fb206a75715f9902aa3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Sep 2014 15:38:09 +0300 Subject: separate processWhisper into two functions. With netcode and without. --- src/net/ea/chathandler.cpp | 7 ++++++- src/net/ea/chathandler.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/net/ea') diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index d835437e8..bd0adf77e 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -147,7 +147,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg) const return; } - std::string chatMsg = msg.readString(chatMsgLength); + processWhisperContinue(nick, msg.readString(chatMsgLength, "message")); +} + +void ChatHandler::processWhisperContinue(const std::string &nick, + std::string chatMsg) const +{ // ignoring future whisper messages if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0) { diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 897949432..c541e0860 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -60,6 +60,9 @@ class ChatHandler notfinal : public Net::ChatHandler void clear() override final; + void processWhisperContinue(const std::string &nick, + std::string chatMsg) const; + protected: typedef std::queue WhisperQueue; WhisperQueue mSentWhispers; -- cgit v1.2.3-70-g09d2