summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-01 23:37:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:55 +0300
commitc8bc9c87d58ba40581da09aa30c79b43f47e0cb0 (patch)
treef540992311d0f19b208df1990c67ab01261209a5
parentd4fc48e1130b7bbfb0d09820ff53142cd4efb68c (diff)
downloadmv-c8bc9c87d58ba40581da09aa30c79b43f47e0cb0.tar.gz
mv-c8bc9c87d58ba40581da09aa30c79b43f47e0cb0.tar.bz2
mv-c8bc9c87d58ba40581da09aa30c79b43f47e0cb0.tar.xz
mv-c8bc9c87d58ba40581da09aa30c79b43f47e0cb0.zip
eathena: fix handling packet SMSG_PLAYER_SHORTCUTS 0x07d9.
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/playerhandler.cpp6
-rw-r--r--src/net/eathena/protocol.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index 9a275b65f..3c91d5774 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -209,7 +209,7 @@ int16_t packet_lengths[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// #0x07C0
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, 0, 0, 0, 0, 0, 268, 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, 0, 0,
//0 1 2 3 4 5 6 7 8 9 a b c d e f
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 150e86d6c..81068b959 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -230,9 +230,9 @@ void PlayerHandler::processPlayerShortcuts(Net::MessageIn &msg)
{
for (int f = 0; f < 27; f ++)
{
- msg.readUInt8(); // type 0: item, 1: skill
- msg.readInt32(); // item or skill id
- msg.readInt16(); // lvl
+ msg.readUInt8("type 0: item, 1: skill");
+ msg.readInt32("item or skill id");
+ msg.readInt16("skill level");
}
}
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 64828cac2..0fb92a116 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -307,7 +307,7 @@
#define SMSG_UPDATE_HOST2 0x7534
#define SMSG_MAP_ACCOUNT_ID 0x0283
-#define SMSG_PLAYER_SHORTCUTS 0x02b9
+#define SMSG_PLAYER_SHORTCUTS 0x07d9
#define SMSG_PLAYER_SHOW_EQUIP 0x02da
#define SMSG_NPC_CUTIN 0x01b3
#define SMSG_NPC_VIEWPOINT 0x0144