diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-08-12 21:47:59 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-08-12 22:01:57 -0600 |
| commit | eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a (patch) | |
| tree | 8b1fab9acbd0eb568d7f7e0b31f8fd4ac02b18a4 /src/net/manaserv/chathandler.cpp | |
| parent | 2293b1c5ef0bb7378140bf73f1fef03a4504bdd2 (diff) | |
| download | mana-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.gz mana-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.bz2 mana-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.xz mana-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.zip | |
Simplify working with the event system
EventManager has been merged into Event, with some new convinience methods
added.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/net/manaserv/chathandler.cpp')
| -rw-r--r-- | src/net/manaserv/chathandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 71e4efde..147bab0a 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -26,7 +26,7 @@ #include "client.h" #include "channel.h" #include "channelmanager.h" -#include "eventmanager.h" +#include "event.h" #include "playerrelations.h" #include "gui/widgets/channeltab.h" @@ -171,7 +171,7 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg) event.setInt("permissions", player_relations .checkPermissionSilently(being->getName(), PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT)); - Mana::EventManager::trigger("Chat", event); + event.trigger("Chat"); } void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg) @@ -234,7 +234,7 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg) Mana::Event event("Whisper"); event.setString("nick", userNick); event.setString("message", chatMsg); - Mana::EventManager::trigger("Chat", event); + event.trigger("Chat"); } void ChatHandler::handleAnnouncement(Net::MessageIn &msg) @@ -242,7 +242,7 @@ void ChatHandler::handleAnnouncement(Net::MessageIn &msg) std::string chatMsg = msg.readString(); Mana::Event event("Announcement"); event.setString("message", chatMsg); - Mana::EventManager::trigger("Chat", event); + event.trigger("Chat"); } void ChatHandler::handleChatMessage(Net::MessageIn &msg) |