summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-20 19:34:22 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-20 19:34:22 +0300
commitd50ef0a41191beb164e9dddc87f6ffadea5b5cc8 (patch)
tree9911b35ebbbcc8658b5bb8c517b034a5131061e4
parentd9773c380e06c089cfee85f07a81ab9167af2982 (diff)
downloadplus-d50ef0a41191beb164e9dddc87f6ffadea5b5cc8.tar.gz
plus-d50ef0a41191beb164e9dddc87f6ffadea5b5cc8.tar.bz2
plus-d50ef0a41191beb164e9dddc87f6ffadea5b5cc8.tar.xz
plus-d50ef0a41191beb164e9dddc87f6ffadea5b5cc8.zip
Move processMapMask from ea namespace to eathena.
-rw-r--r--src/net/ea/playerhandler.cpp9
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/eathena/playerhandler.cpp12
-rw-r--r--src/net/eathena/playerhandler.h2
4 files changed, 14 insertions, 11 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 46dee6769..8b4ed3b34 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -449,15 +449,6 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
}
}
-void PlayerHandler::processMapMask(Net::MessageIn &msg)
-{
- const int mask = msg.readInt32("mask");
- msg.readInt32("unused");
- Map *const map = Game::instance()->getCurrentMap();
- if (map)
- map->setMask(mask);
-}
-
void PlayerHandler::processMapMusic(Net::MessageIn &msg)
{
const int size = msg.readInt16("len") - 5;
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 2134db051..33465eb80 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -78,8 +78,6 @@ class PlayerHandler notfinal : public Net::PlayerHandler
static void processPlayerArrowMessage(Net::MessageIn &msg);
- static void processMapMask(Net::MessageIn &msg);
-
static void processMapMusic(Net::MessageIn &msg);
};
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index d1c48bfbd..486d3dd30 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -23,6 +23,7 @@
#include "net/eathena/playerhandler.h"
#include "configuration.h"
+#include "game.h"
#include "being/beingflag.h"
#include "being/localplayer.h"
@@ -41,6 +42,8 @@
#include "utils/stringutils.h"
+#include "resources/map/map.h"
+
#include "debug.h"
extern Net::PlayerHandler *playerHandler;
@@ -729,4 +732,13 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg)
BLOCK_END("PlayerHandler::processOnlineList")
}
+void PlayerHandler::processMapMask(Net::MessageIn &msg)
+{
+ const int mask = msg.readInt32("mask");
+ msg.readInt32("unused");
+ Map *const map = Game::instance()->getCurrentMap();
+ if (map)
+ map->setMask(mask);
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index 32ab731e3..d32d06ab9 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -114,6 +114,8 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
static void processPlayerClientCommand(Net::MessageIn &msg);
static void processOnlineList(Net::MessageIn &msg);
+
+ static void processMapMask(Net::MessageIn &msg);
};
} // namespace EAthena