From d557ce63e240960746e48c678b4a08ba66f7fe40 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Feb 2017 16:58:18 +0300 Subject: Add custom currency also into shop items list. --- src/gui/models/shopitems.cpp | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'src/gui/models/shopitems.cpp') diff --git a/src/gui/models/shopitems.cpp b/src/gui/models/shopitems.cpp index 061da5110..94bba3be4 100644 --- a/src/gui/models/shopitems.cpp +++ b/src/gui/models/shopitems.cpp @@ -28,10 +28,12 @@ #include "debug.h" -ShopItems::ShopItems(const bool mergeDuplicates) : +ShopItems::ShopItems(const bool mergeDuplicates, + const std::string ¤cy) : ListModel(), mAllShopItems(), mShopItems(), + mCurrency(currency), mMergeDuplicates(mergeDuplicates) { } @@ -58,7 +60,13 @@ ShopItem *ShopItems::addItem(const int id, const int amount, const int price) { - ShopItem *const item = new ShopItem(-1, id, type, color, amount, price); + ShopItem *const item = new ShopItem(-1, + id, + type, + color, + amount, + price, + mCurrency); mShopItems.push_back(item); mAllShopItems.push_back(item); return item; @@ -73,7 +81,13 @@ ShopItem *ShopItems::addItemNoDup(const int id, ShopItem *item = findItem(id, color); if (!item) { - item = new ShopItem(-1, id, type, color, amount, price); + item = new ShopItem(-1, + id, + type, + color, + amount, + price, + mCurrency); mShopItems.push_back(item); mAllShopItems.push_back(item); } @@ -97,7 +111,13 @@ ShopItem *ShopItems::addItem2(const int inventoryIndex, } else { - item = new ShopItem(inventoryIndex, id, type, color, quantity, price); + item = new ShopItem(inventoryIndex, + id, + type, + color, + quantity, + price, + mCurrency); mShopItems.push_back(item); mAllShopItems.push_back(item); } -- cgit v1.2.3-70-g09d2