summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-22 15:45:34 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-22 15:45:34 +0300
commitdc4a8bf50b6285079902da824202d29d767b90ec (patch)
tree2249c7269fab6b9ff328510d7af1578904f4df40 /src/net
parentda05d9dd98315378bdded216184294f376643191 (diff)
downloadmv-dc4a8bf50b6285079902da824202d29d767b90ec.tar.gz
mv-dc4a8bf50b6285079902da824202d29d767b90ec.tar.bz2
mv-dc4a8bf50b6285079902da824202d29d767b90ec.tar.xz
mv-dc4a8bf50b6285079902da824202d29d767b90ec.zip
Read damaged attribute from all packets.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/inventoryhandler.cpp8
-rw-r--r--src/net/eathena/itemhandler.cpp6
-rw-r--r--src/net/eathena/tradehandler.cpp4
3 files changed, 10 insertions, 8 deletions
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 423679711..45ea1bc3a 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -803,7 +803,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
const int itemId = msg.readInt16("item id");
const int itemType = msg.readUInt8("type");
const unsigned char identified = msg.readUInt8("identify");
- msg.readUInt8("attribute");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
for (int f = 0; f < 4; f++)
@@ -826,7 +826,7 @@ void InventoryHandler::processPlayerStorageAdd(Net::MessageIn &msg)
refine,
color,
fromBool(identified, Identified),
- Damaged_false,
+ damaged,
Favorite_false,
Equipm_false,
Equipped_false);
@@ -1013,7 +1013,7 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
const int itemId = msg.readInt16("item id");
const int itemType = msg.readUInt8("item type");
uint8_t identified = msg.readUInt8("identified");
- msg.readUInt8("attribute");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
for (int f = 0; f < 4; f++)
@@ -1033,7 +1033,7 @@ void InventoryHandler::processPlayerCartAdd(Net::MessageIn &msg)
refine,
ItemColorManager::getColorFromCards(&cards[0]),
fromBool(identified, Identified),
- Damaged_false,
+ damaged,
Favorite_false,
Equipm_false,
Equipped_false);
diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp
index 6bb541649..5ce7a1c6e 100644
--- a/src/net/eathena/itemhandler.cpp
+++ b/src/net/eathena/itemhandler.cpp
@@ -26,6 +26,8 @@
#include "itemcolormanager.h"
#include "logger.h"
+#include "enums/simpletypes/damaged.h"
+
#include "net/eathena/protocol.h"
#include "debug.h"
@@ -123,7 +125,7 @@ void ItemHandler::processItemDropped2(Net::MessageIn &msg)
const int itemType = msg.readUInt8("type");
const Identified identified = fromInt(
msg.readUInt8("identify"), Identified);
- msg.readUInt8("attribute");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
for (int f = 0; f < 4; f++)
@@ -208,7 +210,7 @@ void ItemHandler::processItemVisible2(Net::MessageIn &msg)
const int itemType = msg.readUInt8("type");
const Identified identified = fromInt(
msg.readUInt8("identify"), Identified);
- msg.readUInt8("attribute");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
for (int f = 0; f < 4; f++)
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index bc416cff6..537e205f9 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -186,7 +186,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
const int itemType = msg.readUInt8("item type");
const int amount = msg.readInt32("amount");
const uint8_t identify = msg.readUInt8("identify");
- msg.readUInt8("attribute");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
const uint8_t refine = msg.readUInt8("refine");
int cards[4];
for (int f = 0; f < 4; f++)
@@ -209,7 +209,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
refine,
ItemColorManager::getColorFromCards(&cards[0]),
fromBool(identify, Identified),
- Damaged_false,
+ damaged,
Favorite_false,
Equipm_false);
}