Clear unique item flags in LoadGameLevel()

diasurgical · Nov 9, 2024 · cce04b5 · cce04b5
1 parent 78ce916
commit cce04b5
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
@@ -2713,6 +2713,7 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
 		qtextflag = false;
 		if (!HeadlessMode) {
 			InitInv();
+			ClearUniqueItemFlags();
 			InitQuestText();
 			InitInfoBoxGfx();
 			InitHelp();

diff --git a/Source/items.cpp b/Source/items.cpp
@@ -2479,6 +2479,11 @@ bool IsUniqueAvailable(int i)
 	return gbIsHellfire || i <= 89;
 }
 
+void ClearUniqueItemFlags()
+{
+	memset(UniqueItemFlags, 0, sizeof(UniqueItemFlags));
+}
+
 void InitItemGFX()
 {
 	char arglist[64];
@@ -2488,7 +2493,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
@@ -483,6 +483,7 @@ extern 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);