summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-07-14 02:40:31 +0300
committerAndrei Karas <akaras@inbox.ru>2018-07-14 02:40:31 +0300
commit1c30ebb589656b1d3bdb746ba7f36190e1dd4908 (patch)
tree74a9a4c10186e6a3f27f9a96adc3f957bed8c166
parenta3234e5f4354a4142638b789e5dbd239b45b3a62 (diff)
downloadplus-1c30ebb589656b1d3bdb746ba7f36190e1dd4908.tar.gz
plus-1c30ebb589656b1d3bdb746ba7f36190e1dd4908.tar.bz2
plus-1c30ebb589656b1d3bdb746ba7f36190e1dd4908.tar.xz
plus-1c30ebb589656b1d3bdb746ba7f36190e1dd4908.zip
Update packet SMSG_ROULETTE_INFO_ACK_TYPE 0x0a1c.
-rw-r--r--src/net/eathena/packetsin.inc6
-rw-r--r--src/net/eathena/rouletterecv.cpp13
2 files changed, 17 insertions, 2 deletions
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 9dea969f3..7e7178de2 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -1119,6 +1119,12 @@ if (packetVersionMain >= 20180620)
packet(SMSG_PRIVATE_AIRSHIP_RESPONSE, 0x0A4A, 6, &NpcRecv::processPrivateAirShipResponse, 20180620);
}
+// 20180523
+if (packetVersionMain >= 20180523)
+{
+ packet(SMSG_ROULETTE_INFO_ACK_TYPE, 0x0a1c, -1, &RouletteRecv::processRouletteInfoAckType, 20180523);
+}
+
// 0
// evol always packets
packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531, -1, &LoginRecv::processServerVersion, 0);
diff --git a/src/net/eathena/rouletterecv.cpp b/src/net/eathena/rouletterecv.cpp
index 2c245b30b..49666f49f 100644
--- a/src/net/eathena/rouletterecv.cpp
+++ b/src/net/eathena/rouletterecv.cpp
@@ -39,8 +39,17 @@ void RouletteRecv::processRouletteInfoAckType(Net::MessageIn &msg)
{
msg.readInt16("row");
msg.readInt16("position");
- msg.readInt16("item id");
- msg.readInt16("count");
+ if (msg.getVersion() >= 20180523)
+ {
+ msg.readInt32("item id");
+ msg.readInt16("count");
+ msg.readInt16("unused");
+ }
+ else
+ {
+ msg.readInt16("item id");
+ msg.readInt16("count");
+ }
}
}