Add item type to item object.

2 files changed, 34 insertions, 16 deletions

diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp
index 58bfe0023..e6bbeb787 100644
--- a/src/gui/models/shopitems.cpp
+++ b/src/gui/models/shopitems.cpp
@@ -50,23 +50,32 @@ std::string ShopItems::getElementAt(int i)
     return mShopItems.at(i)->getDisplayName();
 }
 
-void ShopItems::addItem(const int id, const unsigned char color,
-                        const int amount, const int price)
+void ShopItems::addItem(const int id,
+                        const int type,
+                        const unsigned char color,
+                        const int amount,
+                        const int price)
 {
-    mShopItems.push_back(new ShopItem(-1, id, color, amount, price));
+    mShopItems.push_back(new ShopItem(-1, id, type, color, amount, price));
 }
 
-void ShopItems::addItemNoDup(const int id, const unsigned char color,
-                             const int amount, const int price)
+void ShopItems::addItemNoDup(const int id,
+                             const int type,
+                             const unsigned char color,
+                             const int amount,
+                             const int price)
 {
     const ShopItem *const item = findItem(id, color);
     if (!item)
-        mShopItems.push_back(new ShopItem(-1, id, color, amount, price));
+        mShopItems.push_back(new ShopItem(-1, id, type, color, amount, price));
 }
 
-void ShopItems::addItem2(const int inventoryIndex, const int id,
+void ShopItems::addItem2(const int inventoryIndex,
+                         const int id,
+                         const int type,
                          const unsigned char color,
-                         const int quantity, const int price)
+                         const int quantity,
+                         const int price)
 {
     ShopItem *item = nullptr;
     if (mMergeDuplicates)
@@ -78,7 +87,7 @@ void ShopItems::addItem2(const int inventoryIndex, const int id,
     }
     else
     {
-        item = new ShopItem(inventoryIndex, id, color, quantity, price);
+        item = new ShopItem(inventoryIndex, id, type, color, quantity, price);
         mShopItems.push_back(item);
     }
 }
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 5e8fb2b97..68048c65c 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -59,8 +59,11 @@ class ShopItems final : public ListModel
         /**
          * Adds an item to the list.
          */
-        void addItem(const int id, const unsigned char color,
-                     const int amount, const int price);
+        void addItem(const int id,
+                     const int type,
+                     const unsigned char color,
+                     const int amount,
+                     const int price);
 
         /**
          * Adds an item to the list (used by sell dialog). Looks for
@@ -71,12 +74,18 @@ class ShopItems final : public ListModel
          * @param quantity number of available copies of the item
          * @param price price of the item
          */
-        void addItem2(const int inventoryIndex, const int id,
+        void addItem2(const int inventoryIndex,
+                      const int id,
+                      const int type,
                       const unsigned char color,
-                      const int amount, const int price);
-
-        void addItemNoDup(const int id, const unsigned char color,
-                          const int amount, const int price);
+                      const int amount,
+                      const int price);
+
+        void addItemNoDup(const int id,
+                          const int type,
+                          const unsigned char color,
+                          const int amount,
+                          const int price);
 
         /**
          * Returns the number of items in the shop.