Clear unique item flags in LoadGameLevel()

diasurgical · Nov 9, 2024 · bfd289d · bfd289d
1 parent d8dde8d
commit bfd289d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -2884,6 +2884,7 @@ void LoadGameLevelFirstFlagEntry()
 	qtextflag = false;
 	if (!HeadlessMode) {
 		InitInv();
+		ClearUniqueItemFlags();
 		InitQuestText();
 		InitInfoBoxGfx();
 		InitHelp();

diff --git a/Source/items.cpp b/Source/items.cpp
@@ -2413,6 +2413,11 @@ bool IsUniqueAvailable(int i)
 	return gbIsHellfire || i <= 89;
 }
 
+void ClearUniqueItemFlags()
+{
+	memset(UniqueItemFlags, 0, sizeof(UniqueItemFlags));
+}
+
 void InitItemGFX()
 {
 	char arglist[64];
@@ -2422,7 +2427,6 @@ void InitItemGFX()
 		*BufCopy(arglist, "items\\", ItemDropNames[i]) = '\0';
 		itemanims[i] = LoadCel(arglist, ItemAnimWidth);
 	}
-	memset(UniqueItemFlags, 0, sizeof(UniqueItemFlags));
 }
 
 void InitItems()

diff --git a/Source/items.h b/Source/items.h
@@ -487,6 +487,7 @@ extern DVL_API_FOR_TEST bool UniqueItemFlags[128];
 uint8_t GetOutlineColor(const Item &item, bool checkReq);
 bool IsItemAvailable(int i);
 bool IsUniqueAvailable(int i);
+void ClearUniqueItemFlags();
 void InitItemGFX();
 void InitItems();
 void CalcPlrItemVals(Player &player, bool Loadgfx);