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/playerhandler.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/playerhandler.cpp')
| -rw-r--r-- | src/net/manaserv/playerhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp index 2028afd9..4957bbbc 100644 --- a/src/net/manaserv/playerhandler.cpp +++ b/src/net/manaserv/playerhandler.cpp @@ -24,7 +24,7 @@ #include "client.h" #include "effectmanager.h" -#include "eventmanager.h" +#include "event.h" #include "game.h" #include "localplayer.h" #include "log.h" @@ -60,7 +60,7 @@ void RespawnRequestListener::action(const gcn::ActionEvent &event) { Net::getPlayerHandler()->respawn(); - Mana::EventManager::trigger("NPC", Mana::Event("CloseAll")); + Mana::Event::trigger("NPC", "CloseAll"); } extern Connection *gameServerConnection; |