summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-16 14:13:14 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-16 17:04:46 +0300
commit88b62a5e35961c738c70ae193ee49943caf7f625 (patch)
tree2511767e3e2b20b63e0db8041203869a3036b1a6 /src/net/eathena
parentce87c6e969dd2af24e50341e6da86918d4cf52a6 (diff)
downloadmanaplus-88b62a5e35961c738c70ae193ee49943caf7f625.tar.gz
manaplus-88b62a5e35961c738c70ae193ee49943caf7f625.tar.bz2
manaplus-88b62a5e35961c738c70ae193ee49943caf7f625.tar.xz
manaplus-88b62a5e35961c738c70ae193ee49943caf7f625.zip
Move processBeingChat from ea namespace into eathena and tmwa.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/chathandler.cpp62
-rw-r--r--src/net/eathena/chathandler.h2
2 files changed, 64 insertions, 0 deletions
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