From 6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Thu, 26 Aug 2010 16:55:05 +0200
Subject: Merged testing branch into master.

---
 src/net/tmwa/tradehandler.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/net/tmwa/tradehandler.cpp')

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:
-- 
cgit v1.2.3-70-g09d2