Readd packet SMSG_MAP_MASK (tmwa)

6 files changed, 12 insertions, 11 deletions

diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp
index e223cfdbb..3780a1d54 100644
--- a/src/net/ea/playerrecv.cpp
+++ b/src/net/ea/playerrecv.cpp
@@ -224,4 +224,13 @@ void PlayerRecv::processMapMusic(Net::MessageIn &msg)
         map->setMusicFile(music);
 }
 
+void PlayerRecv::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 Ea
diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h
index 35ef92d4a..0f8d3371f 100644
--- a/src/net/ea/playerrecv.h
+++ b/src/net/ea/playerrecv.h
@@ -42,6 +42,7 @@ namespace Ea
         void processPlayerStatUpdate6(Net::MessageIn &msg);
         void processPlayerArrowMessage(Net::MessageIn &msg);
         void processMapMusic(Net::MessageIn &msg);
+        void processMapMask(Net::MessageIn &msg);
     }  // namespace PlayerRecv
 
     static const int NoStat = INT_MAX;
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 3995be748..eeb955fef 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -212,7 +212,7 @@ packet(SMSG_MANNER_MESSAGE,                0x014a,   6, &ChatRecv::processManner
 packet(SMSG_MAP_ACCOUNT_ID,                0x0283,   6, &GameRecv::processMapAccountId);
 packet(SMSG_MAP_AUTH_REFUSE,               0x0074,   3, &GameRecv::processMapAuthRefuse);
 packet(SMSG_MAP_LOGIN_SUCCESS,             0x0a18,  14, &GameRecv::processMapLogin);
-packet(SMSG_MAP_MASK,                      0x0b02,  10, &PlayerRecv::processMapMask);
+packet(SMSG_MAP_MASK,                      0x0b02,  10, &Ea::PlayerRecv::processMapMask);
 packet(SMSG_MAP_MUSIC,                     0x0b05,  -1, &Ea::PlayerRecv::processMapMusic);
 packet(SMSG_MAP_NOT_FOUND,                 0x0840,  -1, &GeneralRecv::processMapNotFound);
 packet(SMSG_MAP_QUIT_RESPONSE,             0x018b,   4, &Ea::GameRecv::processMapQuitResponse);
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index fbde1fb2f..4dcfd98bd 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -422,13 +422,4 @@ void PlayerRecv::processOnlineList(Net::MessageIn &msg)
     BLOCK_END("PlayerRecv::processOnlineList")
 }
 
-void PlayerRecv::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/playerrecv.h b/src/net/eathena/playerrecv.h
index 242e62838..1ab4128be 100644
--- a/src/net/eathena/playerrecv.h
+++ b/src/net/eathena/playerrecv.h
@@ -51,7 +51,6 @@ namespace EAthena
         void processPlayerRankPoints(Net::MessageIn &msg);
         void processPlayerClientCommand(Net::MessageIn &msg);
         void processOnlineList(Net::MessageIn &msg);
-        void processMapMask(Net::MessageIn &msg);
     }  // namespace PlayerRecv
 }  // namespace EAthena
 
diff --git a/src/net/tmwa/packetsin.inc b/src/net/tmwa/packetsin.inc
index c8aefd9c8..afbf4550a 100644
--- a/src/net/tmwa/packetsin.inc
+++ b/src/net/tmwa/packetsin.inc
@@ -168,3 +168,4 @@ packet(SMSG_WALK_RESPONSE,                 0x0087,  12, &PlayerRecv::processWalk
 packet(SMSG_WHISPER,                       0x0097,  -1, &ChatRecv::processWhisper);
 packet(SMSG_WHISPER_RESPONSE,              0x0098,   3, &ChatRecv::processWhisperResponse);
 packet(SMSG_WHO_ANSWER,                    0x00c2,   6, &Ea::GameRecv::processWhoAnswer);
+packet(SMSG_MAP_MASK,                      0x0226,  10, &Ea::PlayerRecv::processMapMask);