summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-10-17 15:34:19 +0300
committerAndrei Karas <akaras@inbox.ru>2015-10-17 15:34:19 +0300
commit3e1eec6460461242ff6548f8c542e0c020d18c4a (patch)
tree2e26b671c35a22a88413de48d55d02a1b30107d1 /src/net
parentec67274fe96652e288dbeadc41d756f49a4b8779 (diff)
downloadmv-3e1eec6460461242ff6548f8c542e0c020d18c4a.tar.gz
mv-3e1eec6460461242ff6548f8c542e0c020d18c4a.tar.bz2
mv-3e1eec6460461242ff6548f8c542e0c020d18c4a.tar.xz
mv-3e1eec6460461242ff6548f8c542e0c020d18c4a.zip
Add layer field to packet SMSG_MAP_SET_TILES_TYPE.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/maprecv.cpp4
-rw-r--r--src/net/eathena/packetsin.inc2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/eathena/maprecv.cpp b/src/net/eathena/maprecv.cpp
index 3843838bd..fbad1ce0c 100644
--- a/src/net/eathena/maprecv.cpp
+++ b/src/net/eathena/maprecv.cpp
@@ -70,8 +70,10 @@ void MapRecv::processSetTilesType(Net::MessageIn &msg)
const int x2 = msg.readInt16("x2");
const int y2 = msg.readInt16("y2");
const BlockTypeT mask = static_cast<BlockTypeT>(msg.readInt32("mask"));
+ const int layer = msg.readInt32("layer");
const std::string name = msg.readString(16, "map name");
-
+ if (layer)
+ return;
Map *const map = viewport->getMap();
// logger->log("map test name: %s, mask %d", map->getGatName().c_str(), (int)mask);
if (map && map->getGatName() == name)
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index a0e611afc..b1f785e95 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -24,7 +24,7 @@ packet(SMSG_ADMIN_ACCOUNT_STATS, 0x0214, 42, &AdminRecv::processAccou
packet(SMSG_ADMIN_GET_LOGIN_ACK, 0x01e0, 30, &AdminRecv::processAdminGetLoginAck);
packet(SMSG_ADMIN_KICK_ACK, 0x00cd, 6, &Ea::AdminRecv::processKickAck);
packet(SMSG_ADMIN_SET_TILE_TYPE, 0x0192, 24, &AdminRecv::processSetTileType);
-packet(SMSG_MAP_SET_TILES_TYPE, 0x0b1b, 30, &MapRecv::processSetTilesType);
+packet(SMSG_MAP_SET_TILES_TYPE, 0x0b1b, 34, &MapRecv::processSetTilesType);
packet(SMSG_ALCHEMIST_RANKS_LIST, 0x021a, 282, &BeingRecv::processAlchemistRanksList);
packet(SMSG_AUCTION_CLOSE, 0x025d, 4, &AuctionRecv::processAuctionClose);
packet(SMSG_AUCTION_MESSAGE, 0x0250, 3, &AuctionRecv::processAuctionMessage);