diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-02 01:22:24 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:55 +0300 |
commit | 41b5a7c2e41e161aa34579a1271d7a4842f02faf (patch) | |
tree | 992beb601ff3648cc19ac5bfa0988e4c8340bae3 /src/net/ea | |
parent | 0fb04d3b0c2390c8ad34c833a44416caf0437fe0 (diff) | |
download | plus-41b5a7c2e41e161aa34579a1271d7a4842f02faf.tar.gz plus-41b5a7c2e41e161aa34579a1271d7a4842f02faf.tar.bz2 plus-41b5a7c2e41e161aa34579a1271d7a4842f02faf.tar.xz plus-41b5a7c2e41e161aa34579a1271d7a4842f02faf.zip |
Move processChat from ea namespace into tmwa and eathena.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/chathandler.cpp | 74 | ||||
-rw-r--r-- | src/net/ea/chathandler.h | 2 |
2 files changed, 0 insertions, 76 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index f24811966..205c17824 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -345,80 +345,6 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg) const BLOCK_END("ChatHandler::processBeingChat") } -void ChatHandler::processChat(Net::MessageIn &msg) -{ - BLOCK_START("ChatHandler::processChat") - const bool channels = msg.getId() == SMSG_PLAYER_CHAT2; - const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT - || msg.getId() == SMSG_PLAYER_CHAT2; - int chatMsgLength = msg.readInt16() - 4; - std::string channel; - if (channels) - { - chatMsgLength -= 3; - channel = msg.readUInt8(); - channel += msg.readUInt8(); - channel += msg.readUInt8(); - } - if (chatMsgLength <= 0) - { - BLOCK_END("ChatHandler::processChat") - return; - } - - std::string chatMsg = msg.readRawString(chatMsgLength); - const size_t pos = chatMsg.find(" : ", 0); - - if (normalChat) - { - bool allow(true); - if (chatWindow) - { - allow = chatWindow->resortChatLog(chatMsg, ChatMsgType::BY_PLAYER, - channel, false, true); - } - - if (channel.empty()) - { - const std::string senseStr("You sense the following: "); - if (actorManager && !chatMsg.find(senseStr)) - { - actorManager->parseLevels( - chatMsg.substr(senseStr.size())); - } - } - - if (pos == std::string::npos && !mShowMotd - && mSkipping && channel.empty()) - { - // skip motd from "new" tmw server - if (mMotdTime == -1) - mMotdTime = cur_time + 1; - else if (mMotdTime == cur_time || mMotdTime < cur_time) - mSkipping = false; - BLOCK_END("ChatHandler::processChat") - return; - } - - if (pos != std::string::npos) - chatMsg.erase(0, pos + 3); - - trim(chatMsg); - - if (localPlayer) - { - if ((chatWindow || mShowMotd) && allow) - localPlayer->setSpeech(chatMsg, channel); - } - } - else if (localChatTab) - { - if (chatWindow) - chatWindow->addGlobalMessage(chatMsg); - } - BLOCK_END("ChatHandler::processChat") -} - void ChatHandler::processMVP(Net::MessageIn &msg) const { BLOCK_START("ChatHandler::processMVP") diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 1db8d6001..897949432 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -54,8 +54,6 @@ class ChatHandler notfinal : public Net::ChatHandler virtual void processBeingChat(Net::MessageIn &msg) const; - virtual void processChat(Net::MessageIn &msg); - virtual void processMVP(Net::MessageIn &msg) const; virtual void processIgnoreAllResponse(Net::MessageIn &msg) const; |