diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 00:16:28 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:13 +0200 |
commit | 404d3f7f2f9aa455bea423a6a00025df23cd6687 (patch) | |
tree | 27f6655b3345be1ab109433a55b0512dfe48cb34 /src/net/manaserv/chathandler.cpp | |
parent | 1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (diff) | |
download | Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.gz Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.bz2 Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.xz Mana-404d3f7f2f9aa455bea423a6a00025df23cd6687.zip |
Removed the Mana namespace
It's just an annoyance when it's only applied to a few classes. Either
we place everything in this namespace or nothing, and at the moment I
don't see any rationale for placing everything in a Mana namespace.
Acked-by: Jared Adams
Diffstat (limited to 'src/net/manaserv/chathandler.cpp')
-rw-r--r-- | src/net/manaserv/chathandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 021dddf0..6c97fae3 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -165,8 +165,8 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg) std::string mes = being->getName() + " : " + chatMsg; - Mana::Event event(being == player_node ? Mana::Event::Player - : Mana::Event::Being); + Event event(being == player_node ? Event::Player + : Event::Being); event.setString("message", mes); event.setString("text", chatMsg); event.setString("nick", being->getName()); @@ -174,7 +174,7 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg) event.setInt("permissions", player_relations .checkPermissionSilently(being->getName(), PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT)); - event.trigger(Mana::Event::ChatChannel); + event.trigger(Event::ChatChannel); } void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg) @@ -234,18 +234,18 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg) std::string userNick = msg.readString(); std::string chatMsg = msg.readString(); - Mana::Event event(Mana::Event::Whisper); + Event event(Event::Whisper); event.setString("nick", userNick); event.setString("message", chatMsg); - event.trigger(Mana::Event::ChatChannel); + event.trigger(Event::ChatChannel); } void ChatHandler::handleAnnouncement(Net::MessageIn &msg) { std::string chatMsg = msg.readString(); - Mana::Event event(Mana::Event::Announcement); + Event event(Event::Announcement); event.setString("message", chatMsg); - event.trigger(Mana::Event::ChatChannel); + event.trigger(Event::ChatChannel); } void ChatHandler::handleChatMessage(Net::MessageIn &msg) |