summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-19 20:27:29 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-19 20:27:47 +0300
commitb37388b381a1251683c588189f496eb47b590769 (patch)
tree1d9d1554b7f6be8c81e612a70113c3c458ab1e99
parent62d4e9b8cf09fdb490dca4388447c87cf6afd573 (diff)
downloadmv-b37388b381a1251683c588189f496eb47b590769.tar.gz
mv-b37388b381a1251683c588189f496eb47b590769.tar.bz2
mv-b37388b381a1251683c588189f496eb47b590769.tar.xz
mv-b37388b381a1251683c588189f496eb47b590769.zip
Rename rnd fields into option fields in packets.
-rw-r--r--src/net/eathena/inventoryrecv.cpp42
-rw-r--r--src/net/eathena/traderecv.cpp6
-rw-r--r--src/net/eathena/vendingrecv.cpp12
3 files changed, 30 insertions, 30 deletions
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index 6faa440a7..9793a1352 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -159,12 +159,12 @@ void InventoryRecv::processPlayerEquipment(Net::MessageIn &msg)
if ((serverVersion >= 8 || serverVersion == 0) &&
msg.getVersion() >= 20150226)
{
- msg.readUInt8("rnd count");
+ msg.readUInt8("option count");
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
ItemFlags flags;
@@ -236,9 +236,9 @@ void InventoryRecv::processPlayerInventoryAdd(Net::MessageIn &msg)
{
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
@@ -690,12 +690,12 @@ void InventoryRecv::processPlayerStorageEquip(Net::MessageIn &msg)
if ((serverVersion >= 8 || serverVersion == 0) &&
msg.getVersion() >= 20150226)
{
- msg.readUInt8("rnd count");
+ msg.readUInt8("option count");
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
@@ -744,9 +744,9 @@ void InventoryRecv::processPlayerStorageAdd(Net::MessageIn &msg)
{
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
@@ -951,9 +951,9 @@ void InventoryRecv::processPlayerCartAdd(Net::MessageIn &msg)
{
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
@@ -1047,12 +1047,12 @@ void InventoryRecv::processPlayerCartEquip(Net::MessageIn &msg)
if ((serverVersion >= 8 || serverVersion == 0) &&
msg.getVersion() >= 20150226)
{
- msg.readUInt8("rnd count");
+ msg.readUInt8("option count");
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
ItemFlags flags;
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
index 3805848c8..6c743b21a 100644
--- a/src/net/eathena/traderecv.cpp
+++ b/src/net/eathena/traderecv.cpp
@@ -92,9 +92,9 @@ void TradeRecv::processTradeItemAdd(Net::MessageIn &msg)
{
for (int f = 0; f < 5; f ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 6d583bca6..7eeb1e65e 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -134,9 +134,9 @@ void VendingRecv::processItemsList(Net::MessageIn &msg)
{
for (int d = 0; d < 5; d ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
@@ -210,9 +210,9 @@ void VendingRecv::processOpen(Net::MessageIn &msg)
{
for (int d = 0; d < 5; d ++)
{
- msg.readInt16("rnd index");
- msg.readInt16("rnd value");
- msg.readUInt8("rnd param");
+ msg.readInt16("option index");
+ msg.readInt16("option value");
+ msg.readUInt8("option param");
}
}
}