From 88b62a5e35961c738c70ae193ee49943caf7f625 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Feb 2015 14:13:14 +0300 Subject: Move processBeingChat from ea namespace into eathena and tmwa. --- src/net/eathena/chathandler.cpp | 62 +++++++++++++++++++++++++++++++++++++++++ src/net/eathena/chathandler.h | 2 ++ 2 files changed, 64 insertions(+) (limited to 'src/net/eathena') diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 5aa12c53a..41fc78f3b 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -683,4 +683,66 @@ void ChatHandler::processWhisperContinue(const std::string &nick, BLOCK_END("ChatHandler::processWhisper") } +void ChatHandler::processBeingChat(Net::MessageIn &msg) +{ + if (!actorManager) + return; + + BLOCK_START("ChatHandler::processBeingChat") + int chatMsgLength = msg.readInt16("len") - 8; + Being *const being = actorManager->findBeing(msg.readInt32("being id")); + if (!being) + { + BLOCK_END("ChatHandler::processBeingChat") + return; + } + + if (chatMsgLength <= 0) + { + BLOCK_END("ChatHandler::processBeingChat") + return; + } + + std::string chatMsg = msg.readRawString(chatMsgLength, "message"); + + if (being->getType() == ActorType::Player) + being->setTalkTime(); + + const size_t pos = chatMsg.find(" : ", 0); + std::string sender_name = ((pos == std::string::npos) + ? "" : chatMsg.substr(0, pos)); + + if (sender_name != being->getName() + && being->getType() == ActorType::Player) + { + if (!being->getName().empty()) + sender_name = being->getName(); + } + else + { + chatMsg.erase(0, pos + 3); + } + + trim(chatMsg); + + bool allow(true); + // We use getIgnorePlayer instead of ignoringPlayer here + // because ignorePlayer' side effects are triggered + // right below for Being::IGNORE_SPEECH_FLOAT. + if (player_relations.checkPermissionSilently(sender_name, + PlayerRelation::SPEECH_LOG) && chatWindow) + { + allow = chatWindow->resortChatLog( + removeColors(sender_name).append(" : ").append(chatMsg), + ChatMsgType::BY_OTHER, GENERAL_CHANNEL, false, true); + } + + if (allow && player_relations.hasPermission(sender_name, + PlayerRelation::SPEECH_FLOAT)) + { + being->setSpeech(chatMsg, GENERAL_CHANNEL); + } + BLOCK_END("ChatHandler::processBeingChat") +} + } // namespace EAthena diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index 3b38c5a25..095a545d6 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -120,6 +120,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler static void processWhisperContinue(const std::string &nick, std::string chatMsg); + + static void processBeingChat(Net::MessageIn &msg); }; } // namespace EAthena -- cgit v1.2.3-60-g2f50