summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-08 02:13:16 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-08 02:19:35 +0300
commit178f4811e8602ba7dacb1a0513baa546088d517d (patch)
treec23cf5dd5d752216e88473c51e7730700942d0fc /src/net/ea
parentda44888ee2de9ae1e5c006126e84b36fcc95d4e5 (diff)
downloadmv-178f4811e8602ba7dacb1a0513baa546088d517d.tar.gz
mv-178f4811e8602ba7dacb1a0513baa546088d517d.tar.bz2
mv-178f4811e8602ba7dacb1a0513baa546088d517d.tar.xz
mv-178f4811e8602ba7dacb1a0513baa546088d517d.zip
Fix compilation errors and more style.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/gamehandler.cpp12
-rw-r--r--src/net/ea/gamehandler.h6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index b7566e271..6d021d6a9 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -43,20 +43,20 @@ GameHandler::GameHandler()
{
mCharID = 0;
- listen(Mana::CHANNEL_GAME);
+ listen(CHANNEL_GAME);
}
-void GameHandler::processEvent(Mana::Channels channel,
- const Mana::Event &event)
+void GameHandler::processEvent(Channels channel,
+ const Event &event)
{
- if (channel == Mana::CHANNEL_GAME)
+ if (channel == CHANNEL_GAME)
{
- if (event.getName() == Mana::EVENT_ENGINESINITALIZED)
+ if (event.getName() == EVENT_ENGINESINITALIZED)
{
if (mMap != "")
Game::instance()->changeMap(mMap);
}
- else if (event.getName() == Mana::EVENT_MAPLOADED)
+ else if (event.getName() == EVENT_MAPLOADED)
{
mapLoadedEvent();
}
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 248175617..59cb148c4 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -32,13 +32,13 @@
namespace Ea
{
-class GameHandler : public Net::GameHandler, public Mana::Listener
+class GameHandler : public Net::GameHandler, public Listener
{
public:
GameHandler();
- virtual void processEvent(Mana::Channels channel,
- const Mana::Event &event);
+ virtual void processEvent(Channels channel,
+ const Event &event);
virtual void who();