summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-06 20:26:56 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 20:26:56 +0300
commitf88429f9c991cd90bfad76b4aba93cb312aaa342 (patch)
treef0a218ded25c399454d2911b65b58f246bd9bd0a
parentcac4c3021450989df296d1c6821f83589f7104f0 (diff)
downloadmanaplus-f88429f9c991cd90bfad76b4aba93cb312aaa342.tar.gz
manaplus-f88429f9c991cd90bfad76b4aba93cb312aaa342.tar.bz2
manaplus-f88429f9c991cd90bfad76b4aba93cb312aaa342.tar.xz
manaplus-f88429f9c991cd90bfad76b4aba93cb312aaa342.zip
eathena: fix packet SMSG_PLAYER_STORAGE_ITEMS 0x0995.
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 3499962fe..c6838fe19 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -362,6 +362,10 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
}
msg.readInt16("len");
+
+ if (!playerInvintory)
+ msg.readString(24, "storage name");
+
const int number = (msg.getLength() - 4) / 23;
for (int loop = 0; loop < number; loop++)
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index f3d9d3c11..64b0ff4c5 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, 14, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x0980
0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 31, -1, -1, 0, 0, 0, -1, 0, 0, 11, 9, 8, 0, 0, 0, 0,
+ 31, -1, -1, 0, 0, -1, -1, 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 c5e6fc138..b8eda0e78 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -150,7 +150,7 @@
#define SMSG_PARTY_MESSAGE 0x0109
#define SMSG_PARTY_INVITATION_STATS 0x02c9
-#define SMSG_PLAYER_STORAGE_ITEMS 0x01f0 /**< Item list for storage */
+#define SMSG_PLAYER_STORAGE_ITEMS 0x0995 /**< Item list for storage */
#define SMSG_PLAYER_STORAGE_EQUIP 0x0996 /**< Equipment list for storage */
#define SMSG_PLAYER_STORAGE_STATUS 0x00f2 /**< Slots used and total slots */
#define SMSG_PLAYER_STORAGE_ADD 0x01c4 /**< Add item/equip to storage */