Browse Source

Fix NaKrul book sequence

pull/6481/merge
Eric Robinson 3 months ago committed by Gleb Mazovetskiy
parent
commit
43edea4a37
  1. 1
      Source/diablo.cpp
  2. 4
      Source/objects.cpp
  3. 2
      Source/objects.h

1
Source/diablo.cpp

@ -3356,6 +3356,7 @@ tl::expected<void, std::string> LoadGameLevel(bool firstflag, lvl_entry lvldir)
LoadGameLevelStopMusic(neededTrack);
LoadGameLevelResetCursor();
SetRndSeedForDungeonLevel();
NaKrulTomeSequence = 0;
IncProgress();

4
Source/objects.cpp

@ -58,6 +58,7 @@ int AvailableObjects[MAXOBJECTS];
int ActiveObjects[MAXOBJECTS];
int ActiveObjectCount;
bool LoadingMapObjects;
int NaKrulTomeSequence;
namespace {
@ -115,9 +116,6 @@ object_graphic_id ObjFileList[40];
int leverid;
int numobjfiles;
/** Tracks progress through the tome sequence that spawns Na-Krul (see OperateNakrulBook()) */
int NaKrulTomeSequence;
/** Specifies the X-coordinate delta between barrels. */
int bxadd[8] = { -1, 0, 1, -1, 1, -1, 0, 1 };
/** Specifies the Y-coordinate delta between barrels. */

2
Source/objects.h

@ -287,6 +287,8 @@ extern int ActiveObjects[MAXOBJECTS];
extern int ActiveObjectCount;
/** @brief Indicates that objects are being loaded during gameplay and pre calculated data should be updated. */
extern bool LoadingMapObjects;
/** Tracks progress through the tome sequence that spawns Na-Krul (see OperateNakrulBook()) */
extern int NaKrulTomeSequence;
/**
* @brief Find an object given a point in map coordinates

Loading…
Cancel
Save