MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use IsTileNotSolid() in place of !nSolidTable[dPiece[][]]

Browse source
This commit is contained in:
Anders Jenbo 2021-07-16 21:49:03 +02:00
commit 9264ad4b89
8 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/objects.cpp
View file

@ -670,7 +670,7 @@ void AddObjTraps()
if (GenerateRnd(2) == 0) {
int xp = i - 1;
while (!nSolidTable[dPiece[xp][j]]) // BUGFIX: check if xp >= 0
while (IsTileNotSolid({ xp, j })) // BUGFIX: check if xp >= 0
xp--;
if (!WallTrapLocOkK(xp, j) || i - xp <= 1)
@ -683,7 +683,7 @@ void AddObjTraps()
Objects[oi]._oTrapFlag = true;
} else {
int yp = j - 1;
while (!nSolidTable[dPiece[i][yp]]) // BUGFIX: check if yp >= 0
while (IsTileNotSolid({ i, yp })) // BUGFIX: check if yp >= 0
yp--;
if (!WallTrapLocOkK(i, yp) || j - yp <= 1)