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/actorsprite.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/actorsprite.cpp')
| -rw-r--r-- | src/actorsprite.cpp | 6 |
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); |