Revert operator++ removal

OpenRCT2 · Dec 8, 2020 · 658cd7e · 658cd7e
1 parent 5d19111
commit 658cd7e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
@@ -1982,7 +1982,7 @@ void window_guest_inventory_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(dpi, STR_CARRYING, nullptr, COLOUR_BLACK, screenCoords);
     screenCoords.y += 10;
 
-    for (ShopItem item = ShopItem::Balloon; item < ShopItem::Count; item = ShopItem(EnumValue(item) + 1))
+    for (ShopItem item = ShopItem::Balloon; item < ShopItem::Count; item++)
     {
         if (screenCoords.y >= maxY)
             break;

diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp
@@ -13,6 +13,11 @@
 #include "../localisation/StringIds.h"
 #include "../sprites.h"
 
+ShopItem& operator++(ShopItem& d, int)
+{
+    return d = (d == ShopItem::Count) ? ShopItem::Balloon : ShopItem(EnumValue(d) + 1);
+}
+
 uint64_t gSamePriceThroughoutPark;
 
 // clang-format off

diff --git a/src/openrct2/ride/ShopItem.h b/src/openrct2/ride/ShopItem.h
@@ -72,6 +72,8 @@ enum class ShopItem : uint8_t
     None = 255
 };
 
+ShopItem& operator++(ShopItem& d, int);
+
 using ShopItemIndex = ShopItem;
 
 struct ShopItemStrings