Fix adding items to trade.

Now possible add same items from all ways.
Also added protection from adding same stackable items.

1 files changed, 24 insertions, 9 deletions

diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index c607636d9..d00fb61f4 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -246,8 +246,11 @@ void TradeWindow::receivedOk(bool own)
     }
 }
 
-void TradeWindow::tradeItem(Item *item, int quantity)
+void TradeWindow::tradeItem(Item *item, int quantity, bool check)
 {
+    if (check && !checkItem(item))
+        return;
+
     Net::getTradeHandler()->addItem(item, quantity);
 }
 
@@ -325,15 +328,9 @@ void TradeWindow::action(const gcn::ActionEvent &event)
         if (mMyInventory->getFreeSlot() == -1)
             return;
 
-        if (mMyInventory->contains(item))
-        {
-            if (localChatTab)
-            {
-                localChatTab->chatLog(_("Failed adding item. You can not "
-                    "overlap one kind of item on the window."), BY_SERVER);
-            }
+
+        if (!checkItem(item))
             return;
-        }
 
         // Choose amount of items to trade
         ItemAmountWindow::showWindow(ItemAmountWindow::TradeAdd, this, item);
@@ -442,3 +439,21 @@ void TradeWindow::initTrade(std::string nick)
     if (!player_relations.isGoodName(nick))
         setCaptionFont(gui->getSecureFont());
 }
+
+bool TradeWindow::checkItem(Item *item)
+{
+    Item *tradeItem = mMyInventory->findItem(
+        item->getId(), item->getColor());
+
+    if (tradeItem && (tradeItem->getQuantity() > 1
+        || item->getQuantity() > 1))
+    {
+        if (localChatTab)
+        {
+            localChatTab->chatLog(_("Failed adding item. You can not "
+                "overlap one kind of item on the window."), BY_SERVER);
+        }
+        return false;
+    }
+    return true;
+}