Merge branch 'master' of github.com:diasurgical/devilution

This commit is contained in:
Anders Jenbo 2020-04-06 11:46:08 +02:00
commit 3c5982083f
48 changed files with 589 additions and 550 deletions

View file

@ -11,9 +11,10 @@ DEVILUTION_BEGIN_NAMESPACE
BOOL update_seed_check = FALSE;
#endif
#define DEBUGSEEDS 4096
int seed_index;
int level_seeds[NUMLEVELS];
int seed_table[4096];
int level_seeds[NUMLEVELS + 1];
int seed_table[DEBUGSEEDS];
BYTE *pSquareCel;
char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
@ -36,9 +37,9 @@ void CheckDungeonClear()
for (j = 0; j < MAXDUNY; j++) {
for (i = 0; i < MAXDUNX; i++) {
if (dMonster[i][j])
if (dMonster[i][j] != 0)
app_fatal("Monsters not cleared");
if (dPlayer[i][j])
if (dPlayer[i][j] != 0)
app_fatal("Players not cleared");
dMonsDbg[currlevel][i][j] = dFlags[i][j] & BFLAG_VISIBLE;
@ -214,7 +215,7 @@ void GetDebugMonster()
mi1 = pcursmonst;
if (mi1 == -1) {
mi2 = dMonster[cursmx][cursmy];
if (mi2) {
if (mi2 != 0) {
mi1 = mi2 - 1;
if (mi2 <= 0)
mi1 = -1 - mi2;
@ -229,7 +230,8 @@ void NextDebugMonster()
{
char dstr[128];
if (dbgmon++ == MAXMONSTERS)
dbgmon++;
if (dbgmon == MAXMONSTERS)
dbgmon = 0;
sprintf(dstr, "Current debug monster = %i", dbgmon);