rename numPremiumItems

numPremiumsItems remains a non-class variable in the store refactor PR.
diasurgical · Sep 20, 2024 · a86a366 · a86a366
1 parent 321e738
commit a86a366
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Source/items.cpp b/Source/items.cpp
@@ -4397,14 +4397,14 @@ void SpawnPremium(const Player &player)
 {
 	int lvl = player.getCharacterLevel();
 	int maxItems = gbIsHellfire ? SMITH_PREMIUM_ITEMS : 6;
-	if (numPremiumItems < maxItems) {
+	if (NumPremiumItems < maxItems) {
 		for (int i = 0; i < maxItems; i++) {
 			if (premiumItem[i].isEmpty()) {
 				int plvl = premiumItemLevel + (gbIsHellfire ? premiumLvlAddHellfire[i] : premiumlvladd[i]);
 				SpawnOnePremium(premiumItem[i], plvl, player);
 			}
 		}
-		numPremiumItems = maxItems;
+		NumPremiumItems = maxItems;
 	}
 	while (premiumItemLevel < lvl) {
 		premiumItemLevel++;

diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
@@ -2523,7 +2523,7 @@ void LoadGame(bool firstflag)
 		memset(dLight, 0, sizeof(dLight));
 	}
 
-	numPremiumItems = file.NextBE<int32_t>();
+	NumPremiumItems = file.NextBE<int32_t>();
 	premiumItemLevel = file.NextBE<int32_t>();
 
 	for (int i = 0; i < giNumberOfSmithPremiumItems; i++)
@@ -2786,7 +2786,7 @@ void SaveGameData(SaveWriter &saveWriter)
 		}
 	}
 
-	file.WriteBE<int32_t>(numPremiumItems);
+	file.WriteBE<int32_t>(NumPremiumItems);
 	file.WriteBE<int32_t>(premiumItemLevel);
 
 	for (int i = 0; i < giNumberOfSmithPremiumItems; i++)

diff --git a/Source/stores.cpp b/Source/stores.cpp
@@ -39,7 +39,7 @@ int8_t playerItemIndexes[48];
 Item playerItem[48];
 
 Item smithItem[SMITH_ITEMS];
-int numPremiumItems;
+int NumPremiumItems;
 int premiumItemLevel;
 Item premiumItem[SMITH_PREMIUM_ITEMS];
 
@@ -1374,7 +1374,7 @@ void SmithBuyPItem(Item &item)
 	}
 
 	premiumItem[xx].clear();
-	numPremiumItems--;
+	NumPremiumItems--;
 	SpawnPremium(*MyPlayer);
 }
 
@@ -2112,7 +2112,7 @@ void InitStores()
 	activeStore = TalkID::None;
 	isTextFullSize = false;
 	hasScrollbar = false;
-	numPremiumItems = 0;
+	NumPremiumItems = 0;
 	premiumItemLevel = 1;
 
 	for (auto &premiumitem : premiumItem)

diff --git a/Source/stores.h b/Source/stores.h
@@ -61,7 +61,7 @@ extern DVL_API_FOR_TEST Item playerItem[48];
 /** Items sold by Griswold */
 extern Item smithItem[SMITH_ITEMS];
 /** Number of premium items for sale by Griswold */
-extern int numPremiumItems;
+extern int NumPremiumItems;
 /** Base level of current premium items sold by Griswold */
 extern int premiumItemLevel;
 /** Premium items sold by Griswold */

diff --git a/test/fixtures/memory_map/game.txt b/test/fixtures/memory_map/game.txt
@@ -47,7 +47,7 @@ M_DL 12544 8 dLight
 M_DL 12544 8 dPreLight
 M_DL 1600 8 AutomapView
 M_DL 12544 8 dMissile
-R 32 numPremiumItems
+R 32 NumPremiumItems
 R 32 premiumItemLevel
 C_DA 6 item PremiumItems
 C_HF 15 item PremiumItems