summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-08-12 21:47:59 -0600
committerJared Adams <jaxad0127@gmail.com>2010-08-12 22:01:57 -0600
commiteb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a (patch)
tree8b1fab9acbd0eb568d7f7e0b31f8fd4ac02b18a4 /src/being.cpp
parent2293b1c5ef0bb7378140bf73f1fef03a4504bdd2 (diff)
downloadmana-client-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.gz
mana-client-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.bz2
mana-client-eb2c0cae1cb7a02b72c15de0f4e8f4a68a9fa53a.tar.xz
mana-client-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/being.cpp')
-rw-r--r--src/being.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 9c56dec3..1b95b17d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -26,7 +26,7 @@
#include "client.h"
#include "configuration.h"
#include "effectmanager.h"
-#include "eventmanager.h"
+#include "event.h"
#include "graphics.h"
#include "guild.h"
#include "localplayer.h"
@@ -1200,7 +1200,7 @@ void Being::talkTo()
{
Mana::Event event("doTalk");
event.setInt("npcId", mId);
- Mana::EventManager::trigger("NPC", event);
+ event.trigger("NPC");
}
void Being::event(const std::string &channel, const Mana::Event &event)