Browse Source

Clear unique item flags in LoadGameLevel()

pull/5507/merge
staphen 1 year ago committed by Anders Jenbo
parent
commit
bfd289db88
  1. 1
      Source/diablo.cpp
  2. 6
      Source/items.cpp
  3. 1
      Source/items.h

1
Source/diablo.cpp

@ -2884,6 +2884,7 @@ void LoadGameLevelFirstFlagEntry()
qtextflag = false; qtextflag = false;
if (!HeadlessMode) { if (!HeadlessMode) {
InitInv(); InitInv();
ClearUniqueItemFlags();
InitQuestText(); InitQuestText();
InitInfoBoxGfx(); InitInfoBoxGfx();
InitHelp(); InitHelp();

6
Source/items.cpp

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

1
Source/items.h

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

Loading…
Cancel
Save