summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-03 23:16:04 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:56 +0300
commita37b34f16d81c0b60376c63a11974c401faa2f91 (patch)
treef36c6396b9d4696b3c3c9b636cb0e856f19c93d1 /src/net/eathena
parent9049b5a8d88f864a99df228df0152adabef4d909 (diff)
downloadmanaplus-a37b34f16d81c0b60376c63a11974c401faa2f91.tar.gz
manaplus-a37b34f16d81c0b60376c63a11974c401faa2f91.tar.bz2
manaplus-a37b34f16d81c0b60376c63a11974c401faa2f91.tar.xz
manaplus-a37b34f16d81c0b60376c63a11974c401faa2f91.zip
eathena: fix packet SMSG_PLAYER_EQUIP 0x0999.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/inventoryhandler.cpp7
-rw-r--r--src/net/eathena/protocol.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 3861945df..d0458a61b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -399,9 +399,10 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
void InventoryHandler::processPlayerEquip(Net::MessageIn &msg)
{
BLOCK_START("InventoryHandler::processPlayerEquip")
- const int index = msg.readInt16() - INVENTORY_OFFSET;
- const int equipType = msg.readInt16();
- const uint8_t flag = msg.readUInt8();
+ const int index = msg.readInt16("index") - INVENTORY_OFFSET;
+ const int equipType = msg.readInt32("wear location");
+ msg.readInt16("sprite");
+ const uint8_t flag = msg.readUInt8("result");
if (!flag)
NotifyManager::notify(NotifyTypes::EQUIP_FAILED);
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 49e8502cb..cd6a654c1 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -73,7 +73,7 @@
#define SMSG_PLAYER_INVENTORY_REMOVE 0x00af
#define SMSG_PLAYER_INVENTORY_USE 0x01c8
#define SMSG_PLAYER_EQUIPMENT 0x0992
-#define SMSG_PLAYER_EQUIP 0x00aa
+#define SMSG_PLAYER_EQUIP 0x0999
#define SMSG_PLAYER_UNEQUIP 0x00ac
#define SMSG_PLAYER_ATTACK_RANGE 0x013a
#define SMSG_PLAYER_ARROW_EQUIP 0x013c