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

Clean up L5dflags flags

Browse source
This commit is contained in:
Anders Jenbo 2021-05-19 01:54:14 +02:00
commit 44b58c4970
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/drlg_l1.cpp
View file

@ -1307,11 +1307,9 @@ static void InitL5Dungeon()
static void L5ClearFlags()
{
int i, j;
for (j = 0; j < DMAXY; j++) {
for (i = 0; i < DMAXX; i++) {
L5dflags[i][j] &= 0xBF;
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) {
L5dflags[i][j] &= ~DLRG_CHAMBER;
}
}
}
@ -2628,7 +2626,7 @@ static void DRLG_L5(lvl_entry entry)
for (j = 0; j < DMAXY; j++) {
for (i = 0; i < DMAXX; i++) {
if (L5dflags[i][j] & 0x7F)
if (L5dflags[i][j] & ~DLRG_PROTECTED)
DRLG_PlaceDoor(i, j);
}
}

4
Source/lighting.cpp
View file

@ -668,7 +668,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible)
if (nXPos >= 0 && nXPos <= MAXDUNX && nYPos >= 0 && nYPos <= MAXDUNY) {
if (doautomap) {
if (dFlags[nXPos][nYPos] >= 0) {
if (dFlags[nXPos][nYPos] != 0) {
SetAutomapView({ nXPos, nYPos });
}
dFlags[nXPos][nYPos] |= BFLAG_EXPLORED;
@ -729,7 +729,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible)
|| (x2adj + nCrawlX >= 0 && x2adj + nCrawlX < MAXDUNX && y2adj + nCrawlY >= 0 && y2adj + nCrawlY < MAXDUNY
&& !nBlockTable[dPiece[x2adj + nCrawlX][y2adj + nCrawlY]])) {
if (doautomap) {
if (dFlags[nCrawlX][nCrawlY] >= 0) {
if (dFlags[nCrawlX][nCrawlY] != 0) {
SetAutomapView({ nCrawlX, nCrawlY });
}
dFlags[nCrawlX][nCrawlY] |= BFLAG_EXPLORED;