summaryrefslogtreecommitdiff
path: root/src/gui/windows/tradewindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-23 01:27:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-23 01:27:45 +0300
commit9be90b76adb1518c4ffe0e365a18c5afcc3158f2 (patch)
treebbfea959321e05c329f18ac37757be91f38b9df8 /src/gui/windows/tradewindow.cpp
parent7f1053c5ce9e80485730290d002f7ae25db83996 (diff)
downloadmv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.gz
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.bz2
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.xz
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.zip
Add item type to item object.
Diffstat (limited to 'src/gui/windows/tradewindow.cpp')
-rw-r--r--src/gui/windows/tradewindow.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index c7cd1712d..ba1285366 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -191,6 +191,7 @@ void TradeWindow::setMoney(const int amount)
}
void TradeWindow::addItem(const int id,
+ const int type,
const bool own,
const int quantity,
const uint8_t refine,
@@ -200,11 +201,12 @@ void TradeWindow::addItem(const int id,
const bool favorite) const
{
Inventory *inv = own ? mMyInventory.get() : mPartnerInventory.get();
- inv->addItem(id, quantity, refine, color,
+ inv->addItem(id, type, quantity, refine, color,
identified, damaged, favorite, false, false);
}
void TradeWindow::addItem2(const int id,
+ const int type,
const int *const cards,
const int sz,
const bool own,
@@ -217,7 +219,7 @@ void TradeWindow::addItem2(const int id,
const bool equipment) const
{
Inventory *inv = own ? mMyInventory.get() : mPartnerInventory.get();
- const int slot = inv->addItem(id, quantity, refine, color,
+ const int slot = inv->addItem(id, type, quantity, refine, color,
identified, damaged, favorite, equipment, false);
if (slot >= 0)
inv->setCards(slot, cards, sz);