diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
| commit | 6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d (patch) | |
| tree | 4e6e178095ac8cf89dc0dba4f532913891305436 /src/net/tmwa/tradehandler.cpp | |
| parent | ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f (diff) | |
| download | mana-client-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.gz mana-client-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.bz2 mana-client-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.xz mana-client-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.zip | |
Merged testing branch into master.
Diffstat (limited to 'src/net/tmwa/tradehandler.cpp')
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 05ca3f87..c8615485 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -37,6 +37,8 @@ #include "net/tmwa/protocol.h" +#include "resources/iteminfo.h" + #include "utils/gettext.h" #include "utils/stringutils.h" @@ -167,7 +169,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg) if (type == 0) tradeWindow->setMoney(amount); else - tradeWindow->addItem(type, false, amount, false); + tradeWindow->addItem(type, false, amount); } break; @@ -187,12 +189,12 @@ void TradeHandler::handleMessage(Net::MessageIn &msg) { case 0: // Successfully added item - if (item->isEquipment() && item->isEquipped()) + if (item->isEquippable() && item->isEquipped()) { item->doEvent("doUnequip"); } - tradeWindow->addItem(item->getId(), true, quantity, - item->isEquipment()); + tradeWindow->addItem(item->getId(), true, quantity); + item->increaseQuantity(-quantity); break; case 1: |