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/tmwa/gamehandler.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/tmwa/gamehandler.cpp')
-rw-r--r-- | src/net/tmwa/gamehandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index 79686953..0b3c7d38 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -58,7 +58,7 @@ GameHandler::GameHandler() handledMessages = _messages; gameHandler = this; - listen(Mana::Event::GameChannel); + listen(Event::GameChannel); } void GameHandler::handleMessage(Net::MessageIn &msg) @@ -105,15 +105,15 @@ void GameHandler::handleMessage(Net::MessageIn &msg) } } -void GameHandler::event(Mana::Event::Channel channel, const Mana::Event &event) +void GameHandler::event(Event::Channel channel, const Event &event) { - if (channel == Mana::Event::GameChannel) + if (channel == Event::GameChannel) { - if (event.getType() == Mana::Event::EnginesInitialized) + if (event.getType() == Event::EnginesInitialized) { Game::instance()->changeMap(mMap); } - else if (event.getType() == Mana::Event::MapLoaded) + else if (event.getType() == Event::MapLoaded) { MessageOut outMsg(CMSG_MAP_LOADED); } |