From 6a0e5f20c9faf7623a465daa4a8b350d3a52e5e6 Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Mon, 2 Aug 2010 00:50:35 -0400 Subject: Convert most of the remaining chat system to use the event system Reviewed-by: Jared Adams --- src/net/manaserv/chathandler.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/net/manaserv/chathandler.cpp') diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 40d56bbd..aabe8bb4 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -165,7 +165,9 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg) else mes = "Unknown : " + chatMsg; - localChatTab->chatLog(mes, being == player_node ? BY_PLAYER : BY_OTHER); + Mana::Event event(being == player_node ? "Player" : "Being"); + event.setString("message", mes); + Mana::EventManager::trigger("Chat", event); } void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg) @@ -225,13 +227,18 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg) std::string userNick = msg.readString(); std::string chatMsg = msg.readString(); - chatWindow->whisper(userNick, chatMsg); + Mana::Event event("Whisper"); + event.setString("nick", userNick); + event.setString("message", chatMsg); + Mana::EventManager::trigger("Chat", event); } void ChatHandler::handleAnnouncement(Net::MessageIn &msg) { std::string chatMsg = msg.readString(); - localChatTab->chatLog(chatMsg, BY_GM); + Mana::Event event("Announcement"); + event.setString("message", chatMsg); + Mana::EventManager::trigger("Chat", event); } void ChatHandler::handleChatMessage(Net::MessageIn &msg) -- cgit v1.2.3-60-g2f50