From f65c1e48107fa2cc615c86d8f6829b50c05baa3f Mon Sep 17 00:00:00 2001
From: Majin Sniper <majinsniper@gmx.de>
Date: Mon, 23 Feb 2009 19:19:55 +0100
Subject: Allow to sell non-stackable items like stackables

Make it possible to sell non-stackable items all at once by introducing
"Duplicate Items" and a Shop that can handle them. Also fix a
trivial bug to correctly preview you money while selling.
---
 src/gui/shop.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 8 deletions(-)

(limited to 'src/gui/shop.cpp')

diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index a56116d3..da68cf28 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -24,6 +24,11 @@
 
 #include "../utils/dtor.h"
 
+ShopItems::ShopItems(bool mergeDuplicates) :
+    mMergeDuplicates(mergeDuplicates)
+{
+}
+
 ShopItems::~ShopItems()
 {
     clear();
@@ -39,16 +44,29 @@ std::string ShopItems::getElementAt(int i)
     return mShopItems.at(i)->getDisplayName();
 }
 
-void ShopItems::addItem(int inventoryIndex, short id, int amount, int price)
+void ShopItems::addItem(int inventoryIndex, int id, int quantity,
+        int price)
 {
-    ShopItem *item = new ShopItem(id, amount, price);
-    item->setInvIndex(inventoryIndex);
-    mShopItems.push_back(item);
+    ShopItem* item = 0;
+    if (mMergeDuplicates)
+    {
+        item = findItem(id);
+    }
+
+    if (item)
+    {
+        item->addDuplicate (inventoryIndex, quantity);
+    }
+    else
+    {
+        item = new ShopItem(inventoryIndex, id, quantity, price);
+        mShopItems.push_back(item);
+    }
 }
 
-void ShopItems::addItem(short id, int price)
+void ShopItems::addItem(int id, int price)
 {
-    mShopItems.push_back(new ShopItem(id, 0, price));
+    addItem(-1, id, 0, price);
 }
 
 ShopItem* ShopItems::at(int i) const
@@ -56,13 +74,30 @@ ShopItem* ShopItems::at(int i) const
     return mShopItems.at(i);
 }
 
+void ShopItems::erase(int i)
+{
+    mShopItems.erase(mShopItems.begin() + i);
+}
+
 void ShopItems::clear()
 {
     delete_all(mShopItems);
     mShopItems.clear();
 }
 
-std::vector<ShopItem*>* ShopItems::getShop()
+ShopItem* ShopItems::findItem(int id)
 {
-    return &mShopItems;
+    ShopItem *item;
+
+    std::vector<ShopItem*>::iterator it;
+    for(it = mShopItems.begin(); it != mShopItems.end(); it++)
+    {
+        item = *(it);
+        if (item->getId() == id)
+        {
+            return item;
+        }
+    }
+
+    return 0;
 }
-- 
cgit v1.2.3-70-g09d2