diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/sell.cpp | 2 | ||||
| -rw-r--r-- | src/gui/trade.cpp | 2 | ||||
| -rw-r--r-- | src/gui/trade.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/shopitems.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/shopitems.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp index 3a5d8c29c..5b05c6865 100644 --- a/src/gui/sell.cpp +++ b/src/gui/sell.cpp @@ -151,7 +151,7 @@ void SellDialog::addItem(const Item *item, int price) if (!item) return; - mShopItems->addItem(item->getInvIndex(), item->getId(), + mShopItems->addItem2(item->getInvIndex(), item->getId(), item->getQuantity(), price); mShopItemList->adjustSize(); diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index be4891103..ede4c7a3d 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -160,7 +160,7 @@ void TradeWindow::addItem(int id, bool own, int quantity, mPartnerInventory->addItem(id, quantity, refine, color); } -void TradeWindow::addItem(int id, bool own, int quantity, +void TradeWindow::addItem2(int id, bool own, int quantity, int refine, unsigned char color, bool equipment) { if (own) diff --git a/src/gui/trade.h b/src/gui/trade.h index fcaa2f6ac..be2b2673f 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -74,7 +74,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener /** * Add an item to the trade window. */ - void addItem(int id, bool own, int quantity, int refine, + void addItem2(int id, bool own, int quantity, int refine, unsigned char color, bool equipment); /** diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp index 36994801f..3e46f51a4 100644 --- a/src/gui/widgets/shopitems.cpp +++ b/src/gui/widgets/shopitems.cpp @@ -61,7 +61,7 @@ void ShopItems::addItemNoDup(int id, int amount, int price) mShopItems.push_back(new ShopItem(-1, id, amount, price)); } -void ShopItems::addItem(int inventoryIndex, int id, int quantity, int price) +void ShopItems::addItem2(int inventoryIndex, int id, int quantity, int price) { ShopItem *item = 0; if (mMergeDuplicates) diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index 0e9a45f1d..949dcfc78 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -66,7 +66,7 @@ class ShopItems : public gcn::ListModel * @param quantity number of available copies of the item * @param price price of the item */ - void addItem(int inventoryIndex, int id, int amount, int price); + void addItem2(int inventoryIndex, int id, int amount, int price); void addItemNoDup(int id, int amount, int price); diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 815c8f54d..a63c530a6 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -207,7 +207,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg) } else { - tradeWindow->addItem(type, false, amount, refine, + tradeWindow->addItem2(type, false, amount, refine, identify, false); } } @@ -237,7 +237,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg) if (tradeWindow) { - tradeWindow->addItem(item->getId(), true, quantity, + tradeWindow->addItem2(item->getId(), true, quantity, item->getRefine(), item->getColor(), item->isEquipment()); } |