diff options
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.cpp | 12 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.h | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 31c6c8adc..c301e14ee 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -319,7 +319,7 @@ void ItemAmountWindow::action(const ActionEvent &event) const int id = ItemDB::get(mItemsModal->getElementAt( mItemDropDown->getSelected())).getId(); - mItem = new Item(id, 10000, 0, 1, true, false, false); + mItem = new Item(id, 10000, 0, 1, true, false, false, false); if (mUsage == ShopBuyAdd) mMax = 10000; diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index ff434c07c..5360489cb 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -468,7 +468,7 @@ void NpcDialog::action(const ActionEvent &event) if (item) { mInventory->addItem(item->getId(), 1, 1, item->getColor(), - item->getIdentified(), false, false); + item->getIdentified(), item->getDamaged(), false, false); } } } diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 34164758c..0ffbcd34a 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -195,17 +195,18 @@ void TradeWindow::addItem(const int id, const int quantity, const uint8_t refine, const unsigned char color, - const bool identified) const + const bool identified, + const bool damaged) const { if (own) { mMyInventory->addItem(id, quantity, refine, color, - identified, false, false); + identified, damaged, false, false); } else { mPartnerInventory->addItem(id, quantity, refine, color, - identified, false, false); + identified, damaged, false, false); } } @@ -215,17 +216,18 @@ void TradeWindow::addItem2(const int id, const uint8_t refine, const unsigned char color, const bool identified, + const bool damaged, const bool equipment) const { if (own) { mMyInventory->addItem(id, quantity, refine, color, - identified, equipment, false); + identified, damaged, equipment, false); } else { mPartnerInventory->addItem(id, quantity, refine, color, - identified, equipment, false); + identified, damaged, equipment, false); } } diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index ef60b051e..2efe5cde7 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -72,7 +72,8 @@ class TradeWindow final : public Window, const int quantity, const uint8_t refine, const unsigned char color, - const bool identified) const; + const bool identified, + const bool damaged) const; /** * Reset both item containers @@ -88,6 +89,7 @@ class TradeWindow final : public Window, const uint8_t refine, const unsigned char color, const bool identified, + const bool damaged, const bool equipment) const; /** |