diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-08 02:13:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-08 02:19:35 +0300 |
| commit | 178f4811e8602ba7dacb1a0513baa546088d517d (patch) | |
| tree | c23cf5dd5d752216e88473c51e7730700942d0fc /src/event.h | |
| parent | da44888ee2de9ae1e5c006126e84b36fcc95d4e5 (diff) | |
| download | manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.gz manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.bz2 manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.xz manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.zip | |
Fix compilation errors and more style.
Diffstat (limited to 'src/event.h')
| -rw-r--r-- | src/event.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/event.h b/src/event.h index 61bf31e14..7dffaad21 100644 --- a/src/event.h +++ b/src/event.h @@ -26,10 +26,6 @@ #include <set> #include <string> - -namespace Mana -{ - enum Channels { CHANNEL_ACTORSPRITE = 0, @@ -115,9 +111,9 @@ typedef std::set<Listener *> ListenerSet; typedef std::map<Channels, ListenerSet > ListenMap; #define SERVER_NOTICE(message) { \ -Mana::Event event(Mana::EVENT_SERVERNOTICE); \ +Event event(EVENT_SERVERNOTICE); \ event.setString("message", message); \ -Mana::Event::trigger(Mana::CHANNEL_NOTICES, event); } +Event::trigger(CHANNEL_NOTICES, event); } class Event { @@ -172,6 +168,4 @@ class Event VariableMap mData; }; -} // namespace Mana - #endif |