diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-23 01:27:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-23 01:27:45 +0300 |
| commit | 9be90b76adb1518c4ffe0e365a18c5afcc3158f2 (patch) | |
| tree | bbfea959321e05c329f18ac37757be91f38b9df8 /src/net/eathena/tradehandler.cpp | |
| parent | 7f1053c5ce9e80485730290d002f7ae25db83996 (diff) | |
| download | manaplus-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.gz manaplus-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.bz2 manaplus-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.xz manaplus-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.zip | |
Add item type to item object.
Diffstat (limited to 'src/net/eathena/tradehandler.cpp')
| -rw-r--r-- | src/net/eathena/tradehandler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 88bcceb10..457bb0fe4 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -184,7 +184,7 @@ void TradeHandler::processTradeResponse(Net::MessageIn &msg) void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) { const int type = msg.readInt16("type"); - msg.readUInt8("item type"); + const int itemType = msg.readUInt8("item type"); const int amount = msg.readInt32("amount"); const uint8_t identify = msg.readUInt8("identify"); msg.readUInt8("attribute"); @@ -201,10 +201,11 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) } else { - tradeWindow->addItem2(type, + tradeWindow->addItem2(type, itemType, cards, 4, false, amount, - refine, 1, identify != 0, false, false, false); + refine, 1, identify != 0, + false, false, false); } } } @@ -224,7 +225,7 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) return; if (tradeWindow) { - tradeWindow->addItem2(item->getId(), + tradeWindow->addItem2(item->getId(), item->getType(), item->getCards(), 4, true, mQuantity, item->getRefine(), item->getColor(), item->getIdentified(), item->getDamaged(), |