From 9be90b76adb1518c4ffe0e365a18c5afcc3158f2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 23 Dec 2014 01:27:45 +0300 Subject: Add item type to item object. --- src/net/eathena/tradehandler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/net/eathena/tradehandler.cpp') 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(), -- cgit v1.2.3-60-g2f50