mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

cleanup (#2127)

pull/898/head
qndel 5 years ago committed by GitHub
parent
51ca45e0d6
commit
36dba1cc1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      Source/missiles.cpp
  2. 20
      Source/monster.cpp
  3. 2
      Source/multi.cpp
  4. 74
      Source/objects.cpp
  5. 12
      Source/player.cpp

24
Source/missiles.cpp
Unescape View File

@ -1123,7 +1123,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, BOOL shift, int mx, int my,
missile[i]._miHitFlag = TRUE;
}
}
if (dObject[mx][my]) {
if (dObject[mx][my] != 0) {
oi = dObject[mx][my] > 0 ? dObject[mx][my] - 1 : -(dObject[mx][my] + 1);
if (!object[oi]._oMissFlag) {
if (object[oi]._oBreak == 1)
@ -1350,7 +1350,7 @@ BOOLEAN missiles_found_target(int mi, int *x, int *y, int rad)
ty = *y + CrawlTable[k];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (!nSolidTable[dp] && !dObject[tx][ty] && !dMissile[tx][ty]) {
if (!nSolidTable[dp] && dObject[tx][ty] == 0 && dMissile[tx][ty] == 0) {
missile[mi]._mix = tx;
missile[mi]._miy = ty;
*x = tx;
@ -2130,10 +2130,10 @@ void AddRndTeleport(int mi, int sx, int sy, int dx, int dy, int midir, char mien
if (r1 <= MAXDUNX && r1 >= 0 && r2 <= MAXDUNY && r2 >= 0) { ///BUGFIX: < MAXDUNX / < MAXDUNY
pn = dPiece[r1][r2];
}
} while (nSolidTable[pn] || dObject[r1][r2] || dMonster[r1][r2]);
} while (nSolidTable[pn] || dObject[r1][r2] != 0 || dMonster[r1][r2] != 0);
#else
pn = dPiece[r1 + sx][sy + r2];
} while (nSolidTable[pn] || dObject[r1 + sx][sy + r2] || dMonster[r1 + sx][sy + r2]);
} while (nSolidTable[pn] || dObject[r1 + sx][sy + r2] != 0 || dMonster[r1 + sx][sy + r2] != 0);
#endif
missile[mi]._mirange = 2;
@ -2235,7 +2235,7 @@ void AddTeleport(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy
tx = dx + CrawlTable[pn - 1];
ty = dy + CrawlTable[pn];
if (0 < tx && tx < MAXDUNX && 0 < ty && ty < MAXDUNY) {
if (!(nSolidTable[dPiece[tx][ty]] | dMonster[tx][ty] | dObject[tx][ty] | dPlayer[tx][ty])) {
if ((nSolidTable[dPiece[tx][ty]] | dMonster[tx][ty] | dObject[tx][ty] | dPlayer[tx][ty]) == 0) {
missile[mi]._mix = tx;
missile[mi]._miy = ty;
missile[mi]._misx = tx;
@ -2448,7 +2448,7 @@ void AddTown(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy, in
ty = dy + CrawlTable[k];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (!(dMissile[tx][ty] | nSolidTable[dp] | nMissileTable[dp] | dObject[tx][ty] | dPlayer[tx][ty])) {
if ((dMissile[tx][ty] | nSolidTable[dp] | nMissileTable[dp] | dObject[tx][ty] | dPlayer[tx][ty]) == 0) {
if (!CheckIfTrig(tx, ty)) {
missile[mi]._mix = tx;
missile[mi]._miy = ty;
@ -2589,7 +2589,7 @@ void AddGuardian(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy
pn = dPiece[tx][ty];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
if (LineClear(sx, sy, tx, ty)) {
if (!(dMonster[tx][ty] | nSolidTable[pn] | nMissileTable[pn] | dObject[tx][ty] | dMissile[tx][ty])) {
if ((dMonster[tx][ty] | nSolidTable[pn] | nMissileTable[pn] | dObject[tx][ty] | dMissile[tx][ty]) == 0) {
missile[mi]._mix = tx;
missile[mi]._miy = ty;
missile[mi]._misx = tx;
@ -3036,7 +3036,7 @@ void AddFirewallC(int mi, int sx, int sy, int dx, int dy, int midir, char mienem
if (0 < tx && tx < MAXDUNX && 0 < ty && ty < MAXDUNY) {
k = dPiece[tx][ty];
if (LineClear(sx, sy, tx, ty)) {
if ((sx != tx || sy != ty) && !(nSolidTable[k] | dObject[tx][ty])) {
if ((sx != tx || sy != ty) && (nSolidTable[k] | dObject[tx][ty]) == 0) {
missile[mi]._miVar1 = tx;
missile[mi]._miVar2 = ty;
missile[mi]._miVar5 = tx;
@ -3510,7 +3510,7 @@ void MI_Golem(int i)
if (0 < tx && tx < MAXDUNX && 0 < ty && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (LineClear(missile[i]._miVar1, missile[i]._miVar2, tx, ty)) {
if (!(dMonster[tx][ty] | nSolidTable[dp] | dObject[tx][ty])) {
if ((dMonster[tx][ty] | nSolidTable[dp] | dObject[tx][ty]) == 0) {
l = 6;
SpawnGolum(src, tx, ty, i);
break;
@ -3920,7 +3920,7 @@ void missiles_4359A0(int i)
ty = missile[i]._miy + CrawlTable[k];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (!nSolidTable[dp] && !dMonster[tx][ty] && !dPlayer[tx][ty] && !dObject[tx][ty]) {
if (!nSolidTable[dp] && dMonster[tx][ty] == 0 && dPlayer[tx][ty] == 0 && dObject[tx][ty] == 0) {
j = 6;
int mon = AddMonster(tx, ty, missile[i]._miVar1, 1, TRUE);
M_StartStand(mon, missile[i]._miVar1);
@ -4279,7 +4279,7 @@ void mi_fire_ring(int i)
ty = missile[i]._miVar2 + CrawlTable[k];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (!nSolidTable[dp] && !dObject[tx][ty]) {
if (!nSolidTable[dp] && dObject[tx][ty] == 0) {
if (LineClear(missile[i]._mix, missile[i]._miy, tx, ty)) {
if (nMissileTable[dp] || missile[i]._miVar8)
missile[i]._miVar8 = 1;
@ -4310,7 +4310,7 @@ void mi_light_ring(int i)
ty = missile[i]._miVar2 + CrawlTable[k];
if (tx > 0 && tx < MAXDUNX && ty > 0 && ty < MAXDUNY) {
dp = dPiece[tx][ty];
if (!nSolidTable[dp] && !dObject[tx][ty]) {
if (!nSolidTable[dp] && dObject[tx][ty] == 0) {
if (LineClear(missile[i]._mix, missile[i]._miy, tx, ty)) {
if (nMissileTable[dp] || missile[i]._miVar8)
missile[i]._miVar8 = 1;

20
Source/monster.cpp
Unescape View File

@ -629,8 +629,8 @@ BOOL MonstPlace(int xp, int yp)
if (xp < 0 || xp >= MAXDUNX
|| yp < 0 || yp >= MAXDUNY
|| dMonster[xp][yp]
|| dPlayer[xp][yp]) {
|| dMonster[xp][yp] != 0
|| dPlayer[xp][yp] != 0) {
return FALSE;
}
@ -1295,8 +1295,8 @@ void monster_43C785(int i)
x = mx + offset_x[d];
y = my + offset_y[d];
if (!SolidLoc(x, y)) {
if (!dPlayer[x][y] && !dMonster[x][y]) {
if (!dObject[x][y])
if (dPlayer[x][y] == 0 && dMonster[x][y] == 0) {
if (dObject[x][y] == 0)
break;
oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1);
if (!object[oi]._oSolidFlag)
@ -5731,9 +5731,9 @@ BOOL PosOkMonst(int i, int x, int y)
int oi;
BOOL ret;
ret = !SolidLoc(x, y) && !dPlayer[x][y] && !dMonster[x][y];
ret = !SolidLoc(x, y) && dPlayer[x][y] == 0 && dMonster[x][y] == 0;
oi = dObject[x][y];
if (ret && oi) {
if (ret && oi != 0) {
oi = oi > 0 ? oi - 1 : -(oi + 1);
if (object[oi]._oSolidFlag)
ret = FALSE;
@ -5746,8 +5746,8 @@ BOOL PosOkMonst(int i, int x, int y)
BOOL ret, fire;
fire = FALSE;
ret = !SolidLoc(x, y) && !dPlayer[x][y] && !dMonster[x][y];
if (ret && dObject[x][y]) {
ret = !SolidLoc(x, y) && dPlayer[x][y] == 0 && dMonster[x][y] == 0;
if (ret && dObject[x][y] != 0) {
oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1);
if (object[oi]._oSolidFlag)
ret = FALSE;
@ -5822,7 +5822,7 @@ BOOL PosOkMonst2(int i, int x, int y)
oi = dObject[x][y];
ret = !SolidLoc(x, y);
if (ret && oi) {
if (ret && oi != 0) {
oi = oi > 0 ? oi - 1 : -(oi + 1);
if (object[oi]._oSolidFlag)
ret = FALSE;
@ -5835,7 +5835,7 @@ BOOL PosOkMonst2(int i, int x, int y)
fire = FALSE;
ret = !SolidLoc(x, y);
if (ret && dObject[x][y]) {
if (ret && dObject[x][y] != 0) {
oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1);
if (object[oi]._oSolidFlag)
ret = FALSE;

2
Source/multi.cpp
Unescape View File

@ -483,7 +483,7 @@ void multi_process_network_packets()
plr[dwID]._pBaseStr = pkt->bstr;
plr[dwID]._pBaseMag = pkt->bmag;
plr[dwID]._pBaseDex = pkt->bdex;
if (!cond && plr[dwID].plractive && plr[dwID]._pHitPoints) {
if (!cond && plr[dwID].plractive && plr[dwID]._pHitPoints != 0) {
if (currlevel == plr[dwID].plrlevel && !plr[dwID]._pLvlChanging) {
dx = abs(plr[dwID]._px - pkt->px);
dy = abs(plr[dwID]._py - pkt->py);

74
Source/objects.cpp
Unescape View File

@ -282,11 +282,11 @@ void FreeObjectGFX()
DIABOOL RndLocOk(int xp, int yp)
{
if (dMonster[xp][yp])
if (dMonster[xp][yp] != 0)
return FALSE;
if (dPlayer[xp][yp])
if (dPlayer[xp][yp] != 0)
return FALSE;
if (dObject[xp][yp])
if (dObject[xp][yp] != 0)
return FALSE;
if (dFlags[xp][yp] & BFLAG_POPULATED)
return FALSE;
@ -1971,10 +1971,10 @@ void Obj_Door(int i)
} else {
dx = object[i]._ox;
dy = object[i]._oy;
dok = !dMonster[dx][dy];
dok = dok HFAND !dItem[dx][dy];
dok = dok HFAND !dDead[dx][dy];
dok = dok HFAND !dPlayer[dx][dy];
dok = dMonster[dx][dy] == 0;
dok = dok HFAND (dItem[dx][dy] == 0);
dok = dok HFAND (dDead[dx][dy] == 0);
dok = dok HFAND (dPlayer[dx][dy] == 0);
object[i]._oSelFlag = 2;
object[i]._oVar4 = dok ? 1 : 2;
object[i]._oMissFlag = TRUE;
@ -2022,7 +2022,7 @@ void Obj_FlameTrap(int i)
x = object[i]._ox - 2;
y = object[i]._oy;
for (j = 0; j < 5; j++) {
if (dPlayer[x][y] || dMonster[x][y])
if (dPlayer[x][y] != 0 || dMonster[x][y] != 0)
object[i]._oVar4 = 1;
x++;
}
@ -2030,7 +2030,7 @@ void Obj_FlameTrap(int i)
x = object[i]._ox;
y = object[i]._oy - 2;
for (k = 0; k < 5; k++) {
if (dPlayer[x][y] || dMonster[x][y])
if (dPlayer[x][y] != 0 || dMonster[x][y] != 0)
object[i]._oVar4 = 1;
y++;
}
@ -2082,7 +2082,7 @@ void Obj_Trap(int i)
dy = object[oti]._oy;
for (y = dy - 1; y <= object[oti]._oy + 1; y++) {
for (x = object[oti]._ox - 1; x <= object[oti]._ox + 1; x++) {
if (dPlayer[x][y]) {
if (dPlayer[x][y] != 0) {
dx = x;
dy = y;
}
@ -2542,9 +2542,9 @@ void OperateL1RDoor(int pnum, int oi, DIABOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_CRCLOS, xp, object[oi]._oy);
}
BOOLEAN dok = !dMonster[xp][yp];
dok = dok && !dItem[xp][yp];
dok = dok && !dDead[xp][yp];
BOOLEAN dok = dMonster[xp][yp] == 0;
dok = dok && dItem[xp][yp] == 0;
dok = dok && dDead[xp][yp] == 0;
if (dok) {
#else
if (!deltaload)
@ -2650,9 +2650,9 @@ void OperateL1LDoor(int pnum, int oi, DIABOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_CRCLOS, xp, object[oi]._oy);
}
BOOLEAN dok = !dMonster[xp][yp];
dok = dok && !dItem[xp][yp];
dok = dok && !dDead[xp][yp];
BOOLEAN dok = dMonster[xp][yp] == 0;
dok = dok && dItem[xp][yp] == 0;
dok = dok && dDead[xp][yp] == 0;
if (dok) {
#else
if (!deltaload)
@ -2723,9 +2723,9 @@ void OperateL2RDoor(int pnum, int oi, DIABOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_DOORCLOS, object[oi]._ox, yp);
dok = !dMonster[xp][yp];
dok = dok HFAND !dItem[xp][yp];
dok = dok HFAND !dDead[xp][yp];
dok = dMonster[xp][yp] == 0;
dok = dok HFAND (dItem[xp][yp] == 0);
dok = dok HFAND (dDead[xp][yp] == 0);
if (dok) {
if (pnum == myplr && sendflag)
NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi);
@ -2768,9 +2768,9 @@ void OperateL2LDoor(int pnum, int oi, BOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_DOORCLOS, object[oi]._ox, yp);
dok = !dMonster[xp][yp];
dok = dok HFAND !dItem[xp][yp];
dok = dok HFAND !dDead[xp][yp];
dok = dMonster[xp][yp] == 0;
dok = dok HFAND (dItem[xp][yp] == 0);
dok = dok HFAND (dDead[xp][yp] == 0);
if (dok) {
if (pnum == myplr && sendflag)
NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi);
@ -2814,9 +2814,9 @@ void OperateL3RDoor(int pnum, int oi, DIABOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_DOORCLOS, object[oi]._ox, yp);
dok = !dMonster[xp][yp];
dok = dok HFAND !dItem[xp][yp];
dok = dok HFAND !dDead[xp][yp];
dok = dMonster[xp][yp] == 0;
dok = dok HFAND (dItem[xp][yp] == 0);
dok = dok HFAND (dDead[xp][yp] == 0);
if (dok) {
if (pnum == myplr && sendflag)
NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi);
@ -2860,9 +2860,9 @@ void OperateL3LDoor(int pnum, int oi, DIABOOL sendflag)
if (!deltaload)
PlaySfxLoc(IS_DOORCLOS, object[oi]._ox, yp);
dok = !dMonster[xp][yp];
dok = dok HFAND !dItem[xp][yp];
dok = dok HFAND !dDead[xp][yp];
dok = dMonster[xp][yp] == 0;
dok = dok HFAND (dItem[xp][yp] == 0);
dok = dok HFAND (dDead[xp][yp] == 0);
if (dok) {
if (pnum == myplr && sendflag)
NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi);
@ -2884,14 +2884,14 @@ void MonstCheckDoors(int m)
mx = monster[m]._mx;
my = monster[m]._my;
if (dObject[mx - 1][my - 1]
|| dObject[mx][my - 1]
|| dObject[mx + 1][my - 1]
|| dObject[mx - 1][my]
|| dObject[mx + 1][my]
|| dObject[mx - 1][my + 1]
|| dObject[mx][my + 1]
|| dObject[mx + 1][my + 1]) {
if (dObject[mx - 1][my - 1] != 0
|| dObject[mx][my - 1] != 0
|| dObject[mx + 1][my - 1] != 0
|| dObject[mx - 1][my] != 0
|| dObject[mx + 1][my] != 0
|| dObject[mx - 1][my + 1] != 0
|| dObject[mx][my + 1] != 0
|| dObject[mx + 1][my + 1] != 0) {
for (i = 0; i < nobjects; ++i) {
oi = objectactive[i];
if ((object[oi]._otype == OBJ_L1LDOOR || object[oi]._otype == OBJ_L1RDOOR) && object[oi]._oVar4 == 0) {
@ -3908,7 +3908,7 @@ void OperateShrine(int pnum, int i, int sType)
if (j > MAXDUNX * 112)
break;
lv = dPiece[xx][yy];
} while (nSolidTable[lv] || dObject[xx][yy] || dMonster[xx][yy]);
} while (nSolidTable[lv] || dObject[xx][yy] != 0 || dMonster[xx][yy] != 0);
AddMissile(plr[pnum]._px, plr[pnum]._py, xx, yy, plr[pnum]._pdir, MIS_RNDTELEPORT, -1, pnum, 0, 2 * leveltype);
if (pnum != myplr)
return;

12
Source/player.cpp
Unescape View File

@ -3031,7 +3031,7 @@ BOOL PM_DoAttack(int pnum)
dx = plr[pnum]._px + offset_x[dir];
dy = plr[pnum]._py + offset_y[dir];
if (dMonster[dx][dy]) {
if (dMonster[dx][dy] != 0) {
if (dMonster[dx][dy] > 0) {
m = dMonster[dx][dy] - 1;
} else {
@ -3059,7 +3059,7 @@ BOOL PM_DoAttack(int pnum)
m = -(dMonster[dx][dy] + 1);
}
didhit = PlrHitMonst(pnum, m);
} else if (dPlayer[dx][dy] && !FriendlyMode) {
} else if (dPlayer[dx][dy] != 0 && !FriendlyMode) {
BYTE p = dPlayer[dx][dy];
if (dPlayer[dx][dy] > 0) {
p = dPlayer[dx][dy] - 1;
@ -3951,18 +3951,18 @@ BOOL PosOkPlayer(int pnum, int x, int y)
PosOK = FALSE;
if (x >= 0 && x < MAXDUNX && y >= 0 && y < MAXDUNY && !SolidLoc(x, y) && dPiece[x][y]) {
if (dPlayer[x][y]) {
if (dPlayer[x][y] != 0) {
if (dPlayer[x][y] > 0) {
p = dPlayer[x][y] - 1;
} else {
p = -(dPlayer[x][y] + 1);
}
if (p != pnum && p < MAX_PLRS && plr[p]._pHitPoints) {
if (p != pnum && p < MAX_PLRS && plr[p]._pHitPoints != 0) {
return FALSE;
}
}
if (dMonster[x][y]) {
if (dMonster[x][y] != 0) {
if (currlevel == 0) {
return FALSE;
}
@ -3974,7 +3974,7 @@ BOOL PosOkPlayer(int pnum, int x, int y)
}
}
if (dObject[x][y]) {
if (dObject[x][y] != 0) {
if (dObject[x][y] > 0) {
bv = dObject[x][y] - 1;
} else {

Write Preview
Loading…
Cancel
Save