summaryrefslogtreecommitdiff
path: root/src/shopitem.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/shopitem.h
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/shopitem.h')
-rw-r--r--src/shopitem.h25
1 files changed, 5 insertions, 20 deletions
diff --git a/src/shopitem.h b/src/shopitem.h
index 996e04ec..dc1188e0 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -43,15 +43,6 @@ class ShopItem : public Item
*/
ShopItem(int inventoryIndex, int id, int quantity, int price);
- /**
- * Constructor. Creates a new ShopItem. Inventory index will be set to
- * -1 and quantity to 0.
- *
- * @param id the id of the item
- * @param price price of the item
- */
- ShopItem(int id, int price);
-
~ShopItem() override;
/**
@@ -63,20 +54,13 @@ class ShopItem : public Item
void addDuplicate(int inventoryIndex, int quantity);
/**
- * Add a duplicate. Id and price will be taken from this item.
- * Needed for compatibility with ShopDuplicateItems (see) class
- * documentation).
- */
- void addDuplicate();
-
- /**
* Gets the quantity of the currently topmost duplicate.
*
* @return the quantity of the currently topmost duplicate
*/
int getCurrentQuantity() const
{
- return mDuplicates.empty() ? 0 : mDuplicates.top()->quantity;
+ return mDuplicates.empty() ? 0 : mDuplicates.top().quantity;
}
/**
@@ -87,7 +71,7 @@ class ShopItem : public Item
int getCurrentInvIndex() const
{
return mDuplicates.empty() ? mInvIndex :
- mDuplicates.top()->inventoryIndex;
+ mDuplicates.top().inventoryIndex;
}
/**
@@ -126,11 +110,12 @@ class ShopItem : public Item
/**
* Struct to keep track of duplicates.
*/
- using DuplicateItem = struct {
+ struct DuplicateItem
+ {
int inventoryIndex;
int quantity;
};
- std::stack<DuplicateItem*> mDuplicates; /** <-- Stores duplicates */
+ std::stack<DuplicateItem> mDuplicates; /** <-- Stores duplicates */
};
#endif