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/net/manaserv | |
parent | da44888ee2de9ae1e5c006126e84b36fcc95d4e5 (diff) | |
download | manaverse-178f4811e8602ba7dacb1a0513baa546088d517d.tar.gz manaverse-178f4811e8602ba7dacb1a0513baa546088d517d.tar.bz2 manaverse-178f4811e8602ba7dacb1a0513baa546088d517d.tar.xz manaverse-178f4811e8602ba7dacb1a0513baa546088d517d.zip |
Fix compilation errors and more style.
Diffstat (limited to 'src/net/manaserv')
-rw-r--r-- | src/net/manaserv/generalhandler.cpp | 14 | ||||
-rw-r--r-- | src/net/manaserv/generalhandler.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index 584faa368..d95c98d23 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -93,8 +93,8 @@ GeneralHandler::GeneralHandler(): generalHandler = this; - listen(Mana::CHANNEL_CLIENT); - listen(Mana::CHANNEL_GAME); + listen(CHANNEL_CLIENT); + listen(CHANNEL_GAME); } void GeneralHandler::load() @@ -176,10 +176,10 @@ void GeneralHandler::clearHandlers() clearNetworkHandlers(); } -void GeneralHandler::processEvent(Mana::Channels channel, - const Mana::Event &event) +void GeneralHandler::processEvent(Channels channel, + const Event &event) { - if (channel == Mana::CHANNEL_CLIENT) + if (channel == CHANNEL_CLIENT) { int newState = event.getInt("newState"); @@ -195,9 +195,9 @@ void GeneralHandler::processEvent(Mana::Channels channel, Attributes::informItemDB(); } } - else if (channel == Mana::CHANNEL_GAME) + else if (channel == CHANNEL_GAME) { - if (event.getName() == Mana::EVENT_GUIWINDOWSLOADED) + if (event.getName() == EVENT_GUIWINDOWSLOADED) { inventoryWindow->setSplitAllowed(true); skillDialog->loadSkills("mana-skills.xml"); diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h index fcb28c846..6ea5c7845 100644 --- a/src/net/manaserv/generalhandler.h +++ b/src/net/manaserv/generalhandler.h @@ -33,7 +33,7 @@ namespace ManaServ { -class GeneralHandler : public Net::GeneralHandler, public Mana::Listener +class GeneralHandler : public Net::GeneralHandler, public Listener { public: GeneralHandler(); @@ -50,7 +50,7 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener void clearHandlers(); - void processEvent(Mana::Channels channel, const Mana::Event &event); + void processEvent(Channels channel, const Event &event); protected: MessageHandlerPtr mBeingHandler; |