summaryrefslogtreecommitdiff
path: root/src/gui/models
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-23 01:27:45 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-23 01:27:45 +0300
commit9be90b76adb1518c4ffe0e365a18c5afcc3158f2 (patch)
treebbfea959321e05c329f18ac37757be91f38b9df8 /src/gui/models
parent7f1053c5ce9e80485730290d002f7ae25db83996 (diff)
downloadmv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.gz
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.bz2
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.tar.xz
mv-9be90b76adb1518c4ffe0e365a18c5afcc3158f2.zip
Add item type to item object.
Diffstat (limited to 'src/gui/models')
-rw-r--r--src/gui/models/shopitems.cpp27
-rw-r--r--src/gui/models/shopitems.h23
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.