summaryrefslogtreecommitdiff
path: root/src/event.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/event.h')
-rw-r--r--src/event.h10
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