Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 41 insertions, 7 deletions

diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 7b28cef4..3cdc304c 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -23,6 +23,11 @@
 
 #include "../utils/dtor.h"
 
+ShopItems::ShopItems(bool mergeDuplicates) :
+    mMergeDuplicates(mergeDuplicates)
+{
+}
+
 ShopItems::~ShopItems()
 {
     clear();
@@ -40,15 +45,27 @@ std::string ShopItems::getElementAt(int i)
 
 void ShopItems::addItem(int id, int amount, int price)
 {
-    mShopItems.push_back(new ShopItem(id, amount, price));
+    mShopItems.push_back(new ShopItem(-1, id, amount, price));
 }
 
 #ifdef EATHENA_SUPPORT
-void ShopItems::addItem(int inventoryIndex, int 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);
+    }
 }
 #endif
 
@@ -57,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;
 }