summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-03 23:18:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-03 23:18:35 +0300
commitf644bad683cf30f2f98fd6cd911b8bf53e98e01c (patch)
treee9a0645da7732f72d7826934934292b84a9c8105 /src
parentef52c9f9df0dd3b1e79226af71c772c4a23f9df8 (diff)
downloadmanaplus-f644bad683cf30f2f98fd6cd911b8bf53e98e01c.tar.gz
manaplus-f644bad683cf30f2f98fd6cd911b8bf53e98e01c.tar.bz2
manaplus-f644bad683cf30f2f98fd6cd911b8bf53e98e01c.tar.xz
manaplus-f644bad683cf30f2f98fd6cd911b8bf53e98e01c.zip
Add packet SMSG_PLAYER_UNEQUIP 0x00ac.
Diffstat (limited to 'src')
-rw-r--r--src/net/eathena/inventoryrecv.cpp6
-rw-r--r--src/net/eathena/packetsin.inc3
2 files changed, 7 insertions, 2 deletions
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index e5d5ec059..9a4c83760 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -520,7 +520,11 @@ void InventoryRecv::processPlayerUnEquip(Net::MessageIn &msg)
{
BLOCK_START("InventoryRecv::processPlayerUnEquip")
msg.readInt16("index");
- const int equipType = msg.readInt32("wear location");
+ int equipType;
+ if (msg.getVersion() >= 20120925)
+ equipType = msg.readInt32("wear location");
+ else
+ equipType = msg.readInt16("wear location");
const uint8_t flag = msg.readUInt8("result");
if (flag)
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 209c19040..4cbee5ef9 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -34,6 +34,8 @@ packet(SMSG_PLAYER_INVENTORY, 0x00a3, -1, &InventoryRecv::processP
packet(SMSG_PLAYER_EQUIPMENT, 0x00a4, -1, &InventoryRecv::processPlayerEquipment, 1);
packet(SMSG_PLAYER_STORAGE_ITEMS, 0x00a5, -1, &InventoryRecv::processPlayerStorage, 1);
packet(SMSG_PLAYER_STORAGE_EQUIP, 0x00a6, -1, &InventoryRecv::processPlayerStorageEquip, 1);
+packet(SMSG_PLAYER_EQUIP, 0x00aa, 7, &InventoryRecv::processPlayerEquip, 1);
+packet(SMSG_PLAYER_UNEQUIP, 0x00ac, 7, &InventoryRecv::processPlayerUnEquip, 1);
packet(SMSG_BEING_CHANGE_LOOKS_OUTDATED, 0x00c3, 8, nullptr, 1);
packet(SMSG_TRADE_REQUEST, 0x00e5, 26, &TradeRecv::processTradeRequest, 1);
packet(SMSG_TRADE_ITEM_ADD, 0x00e9, 19, &TradeRecv::processTradeItemAdd, 1);
@@ -53,7 +55,6 @@ packet(SMSG_QUEST_LIST, 0x02b1, -1, &QuestRecv::processAddQu
packet(SMSG_BEING_VIEW_EQUIPMENT, 0x02d7, -1, &BeingRecv::processBeingViewEquipment, 1);
packet(SMSG_PARTY_SETTINGS, 0x0101, 6, &PartyRecv::processPartySettings, 1);
packet(SMSG_PLAYER_HP, 0x0106, 10, &BeingRecv::processBeingHp, 1);
-packet(SMSG_PLAYER_EQUIP, 0x00aa, 7, &InventoryRecv::processPlayerEquip, 1);
// fake packets for add packet name
packet(SMSG_SELECT_CART, 0x0000, 0, nullptr, 0);