Browse Source

Load item graphics early so they are available for hero selection

pull/1823/head
thebigMuh 5 years ago committed by Anders Jenbo
parent
commit
cab62a7dbf
  1. 7
      Source/diablo.cpp
  2. 2
      Source/items.cpp

7
Source/diablo.cpp

@ -321,7 +321,6 @@ static void free_game()
for (i = 0; i < MAX_PLRS; i++)
FreePlayerGFX(i);
FreeItemGFX();
FreeCursor();
FreeLightTable();
#ifdef _DEBUG
@ -695,6 +694,9 @@ static void diablo_init()
#endif
ui_sound_init();
// Item graphics are loaded early, they already get touched during hero selection.
InitItemGFX();
}
static void diablo_splash()
@ -718,6 +720,8 @@ static void diablo_splash()
static void diablo_deinit()
{
FreeItemGFX();
if (sbWasOptionsLoaded)
SaveOptions();
if (was_snd_init) {
@ -1888,7 +1892,6 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
if (firstflag) {
InitInv();
InitItemGFX();
InitQuestText();
InitStores();
InitAutomapOnce();

2
Source/items.cpp

@ -2256,7 +2256,7 @@ void SetupItem(int i)
int it;
it = ItemCAnimTbl[items[i]._iCurs];
items[i]._iAnimData = itemanims[it] ? &*itemanims[it] : nullptr;
items[i]._iAnimData = &*itemanims[it];
items[i]._iAnimLen = ItemAnimLs[it];
items[i]._iIdentified = false;
items[i]._iPostDraw = false;

Loading…
Cancel
Save