summaryrefslogtreecommitdiff
path: root/src/net/tmwa
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/tmwa
parentda44888ee2de9ae1e5c006126e84b36fcc95d4e5 (diff)
downloadmanaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.gz
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.bz2
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.tar.xz
manaplus-178f4811e8602ba7dacb1a0513baa546088d517d.zip
Fix compilation errors and more style.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/generalhandler.cpp10
-rw-r--r--src/net/tmwa/generalhandler.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index a666fa5f4..77c91e1dd 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -244,12 +244,12 @@ void GeneralHandler::clearHandlers()
mNetwork->clearHandlers();
}
-void GeneralHandler::processEvent(Mana::Channels channel,
- const Mana::Event &event)
+void GeneralHandler::processEvent(Channels channel,
+ const Event &event)
{
- if (channel == Mana::CHANNEL_GAME)
+ if (channel == CHANNEL_GAME)
{
- if (event.getName() == Mana::EVENT_GUIWINDOWSLOADED)
+ if (event.getName() == EVENT_GUIWINDOWSLOADED)
{
if (inventoryWindow)
inventoryWindow->setSplitAllowed(false);
@@ -288,7 +288,7 @@ void GeneralHandler::processEvent(Mana::Channels channel,
statusWindow->addAttribute(ATTACK_SPEED, _("Damage per sec."),
false, "");
}
- else if (event.getName() == Mana::EVENT_GUIWINDOWSUNLOADING)
+ else if (event.getName() == EVENT_GUIWINDOWSUNLOADING)
{
if (socialWindow)
{
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index b250ddfd4..73f7a0e1b 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -34,7 +34,7 @@ namespace TmwAthena
{
class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
- public Mana::Listener
+ public Listener
{
public:
GeneralHandler();
@@ -53,7 +53,7 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
void clearHandlers();
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
void reloadPartially();