From 31d83c00f1d684139d2ec940fe9985aafc6e18bc Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Fri, 27 Jan 2023 14:11:56 -0700
Subject: [PATCH] rename INFINITE to INFINITE_AMOUNT

---
 src/fileio/fileio_scen.cpp | 2 +-
 src/scenario/shop.hpp      | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp
index c847454c6..eda093a8a 100644
--- a/src/fileio/fileio_scen.cpp
+++ b/src/fileio/fileio_scen.cpp
@@ -317,7 +317,7 @@ bool load_scenario_v1(fs::path file_to_load, cScenario& scenario, bool only_head
 		if(info.type == eShopItemType::ITEM) {
 			int end = info.first + info.count;
 			end = min(end, scenario.scen_items.size());
-			shop.addItems(info.first, scenario.scen_items.begin() + info.first, scenario.scen_items.begin() + end, cShop::INFINITE);
+			shop.addItems(info.first, scenario.scen_items.begin() + info.first, scenario.scen_items.begin() + end, cShop::INFINITE_AMOUNT);
 		} else {
 			int max = 62;
 			if(info.type == eShopItemType::ALCHEMY)
diff --git a/src/scenario/shop.hpp b/src/scenario/shop.hpp
index 3ef26f3e6..d971e2f12 100644
--- a/src/scenario/shop.hpp
+++ b/src/scenario/shop.hpp
@@ -15,11 +15,6 @@
 #include "item.hpp"
 #include "dialogxml/widgets/pictypes.hpp" // for pic_num_t
 
-// Windows headers are really annoying with their defined constants.
-#ifdef INFINITE
-#undef INFINITE
-#endif
-
 enum class eShopType {NORMAL, ALLOW_DEAD, RANDOM};
 
 enum class eShopPrompt {SHOPPING, HEALING, MAGE, PRIEST, SPELLS, ALCHEMY, TRAINING};
@@ -67,7 +62,7 @@ class cShop {
 	pic_num_t face;
 	size_t firstEmpty() const;
 public:
-	static const size_t INFINITE = 0;
+	static const size_t INFINITE_AMOUNT = 0;
 	cShop();
 	cShop(eShopType type, eShopPrompt prompt, pic_num_t pic, int adj, std::string name);
 	explicit cShop(std::string name);