Simplify working with the event system

EventManager has been merged into Event, with some new convinience methods
added.

Reviewed-by: Chuck Miller

1 files changed, 3 insertions, 3 deletions

diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 535708f0..cdc23dc6 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -23,7 +23,7 @@
 
 #include "client.h"
 #include "effectmanager.h"
-#include "eventmanager.h"
+#include "event.h"
 #include "imagesprite.h"
 #include "localplayer.h"
 #include "log.h"
@@ -264,7 +264,7 @@ void ActorSprite::updateStunMode(int oldMode, int newMode)
         Mana::Event event("Stun");
         event.setInt("oldMode", oldMode);
         event.setInt("newMode", newMode);
-        Mana::EventManager::trigger("ActorSprite", event);
+        event.trigger("ActorSprite");
     }
 
     handleStatusEffect(StatusEffect::getStatusEffect(oldMode, false), -1);
@@ -278,7 +278,7 @@ void ActorSprite::updateStatusEffect(int index, bool newStatus)
         Mana::Event event("UpdateStatusEffect");
         event.setInt("index", index);
         event.setBool("newStatus", newStatus);
-        Mana::EventManager::trigger("ActorSprite", event);
+        event.trigger("ActorSprite");
     }
 
     handleStatusEffect(StatusEffect::getStatusEffect(index, newStatus), index);