summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-03 23:35:23 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:56 +0300
commit6d21b6cbc000d30938309056ea8e8f7bf903f7dc (patch)
tree49c7ebd1d057d012d71cde7bc732a60ff01b07d5
parent7890bb3f423dbdb815d97f066594ae8917c5cee7 (diff)
downloadplus-6d21b6cbc000d30938309056ea8e8f7bf903f7dc.tar.gz
plus-6d21b6cbc000d30938309056ea8e8f7bf903f7dc.tar.bz2
plus-6d21b6cbc000d30938309056ea8e8f7bf903f7dc.tar.xz
plus-6d21b6cbc000d30938309056ea8e8f7bf903f7dc.zip
eathena: fix packet SMSG_PLAYER_UNEQUIP 0x099a.
-rw-r--r--src/net/eathena/inventoryhandler.cpp6
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index da404fe05..ec3c23cef 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -414,9 +414,9 @@ void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
void InventoryHandler::processPlayerUnEquip(Net::MessageIn &msg)
{
BLOCK_START("InventoryHandler::processPlayerUnEquip")
- msg.readInt16(); // inder val - INVENTORY_OFFSET;
- const int equipType = msg.readInt16();
- const uint8_t flag = msg.readUInt8();
+ msg.readInt16("index");
+ const int equipType = msg.readInt32("wear location");
+ const uint8_t flag = msg.readUInt8("result");
if (flag)
mEquips.setEquipment(getSlot(equipType), -1);
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index db9f6b7cb..4e3398c92 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -248,7 +248,7 @@ int16_t packet_lengths[] =
31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x0980
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0,
+ 0, -1, -1, 0, 0, 0, 0, 0, 0, 11, 9, 8, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x09C0
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index cd6a654c1..eba7edc77 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -74,7 +74,7 @@
#define SMSG_PLAYER_INVENTORY_USE 0x01c8
#define SMSG_PLAYER_EQUIPMENT 0x0992
#define SMSG_PLAYER_EQUIP 0x0999
-#define SMSG_PLAYER_UNEQUIP 0x00ac
+#define SMSG_PLAYER_UNEQUIP 0x099a
#define SMSG_PLAYER_ATTACK_RANGE 0x013a
#define SMSG_PLAYER_ARROW_EQUIP 0x013c
#define SMSG_PLAYER_ARROW_MESSAGE 0x013b