From 36ebd857ad0f6890ac2d71ffefb2941b28d2e92c Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 9 Apr 2021 11:00:36 +0200 Subject: [PATCH] :art: Correct style of false comparisons --- Source/doom.cpp | 2 +- Source/drlg_l1.cpp | 10 +++++----- Source/drlg_l4.cpp | 4 ++-- Source/missiles.cpp | 6 +++--- Source/monster.cpp | 2 +- Source/multi.cpp | 2 +- Source/player.cpp | 2 +- Source/towners.cpp | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/doom.cpp b/Source/doom.cpp index d32612392..eb0734ba4 100644 --- a/Source/doom.cpp +++ b/Source/doom.cpp @@ -54,7 +54,7 @@ static bool doom_alloc_cel() { doom_cleanup(); pDoomCel = DiabloAllocPtr(0x39000); - return pDoomCel ? true : false; + return pDoomCel != NULL; } static bool doom_load_graphics() diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp index a412e8e40..5a091162c 100644 --- a/Source/drlg_l1.cpp +++ b/Source/drlg_l1.cpp @@ -954,7 +954,7 @@ static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, in abort = false; found = 0; - while (abort == false) { + while (!abort) { abort = true; if (cx != -1 && sx >= cx - sw && sx <= cx + 12) { sx++; @@ -996,7 +996,7 @@ static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, in } } - if (abort == false) { + if (!abort) { if (++sx == DMAXX - sw) { sx = 0; if (++sy == DMAXY - sh) @@ -1367,7 +1367,7 @@ static void L5roomGen(int x, int y, int w, int h, int dir) cx1 = x - cw; ran = L5checkRoom(cx1 - 1, cy1 - 1, ch + 2, cw + 1); /// BUGFIX: swap args 3 and 4 ("ch+2" and "cw+1") num++; - } while (ran == false && num < 20); + } while (!ran && num < 20); if (ran == true) L5drawRoom(cx1, cy1, cw, ch); @@ -1389,7 +1389,7 @@ static void L5roomGen(int x, int y, int w, int h, int dir) ry = y - height; ran = L5checkRoom(rx - 1, ry - 1, width + 2, height + 1); num++; - } while (ran == false && num < 20); + } while (!ran && num < 20); if (ran == true) L5drawRoom(rx, ry, width, height); @@ -2644,7 +2644,7 @@ static void DRLG_L5(int entry) } } } - } while (doneflag == false); + } while (!doneflag); for (j = 0; j < DMAXY; j++) { for (i = 0; i < DMAXX; i++) { diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp index 81bce3f90..da64b5aba 100644 --- a/Source/drlg_l4.cpp +++ b/Source/drlg_l4.cpp @@ -1137,7 +1137,7 @@ static void L4roomGen(int x, int y, int w, int h, int dir) cx1 = x - cw; ran = L4checkRoom(cx1 - 1, cy1 - 1, ch + 2, cw + 1); /// BUGFIX: swap args 3 and 4 ("ch+2" and "cw+1") num++; - } while (ran == false && num < 20); + } while (!ran && num < 20); if (ran == true) L4drawRoom(cx1, cy1, cw, ch); @@ -1159,7 +1159,7 @@ static void L4roomGen(int x, int y, int w, int h, int dir) ry = y - height; ran = L4checkRoom(rx - 1, ry - 1, width + 2, height + 1); num++; - } while (ran == false && num < 20); + } while (!ran && num < 20); if (ran == true) L4drawRoom(rx, ry, width, height); diff --git a/Source/missiles.cpp b/Source/missiles.cpp index bf008bf68..67bbe1088 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -826,7 +826,7 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s if (mtype == MIS_BONESPIRIT) { dam = plr[pnum]._pHitPoints / 3; } else { - if (shift == false) { + if (!shift) { dam = (mind << 6) + random_(75, (maxd - mind + 1) << 6); if (m == -1) @@ -2603,7 +2603,7 @@ void AddGuardian(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m } } - if (missile[mi]._miDelFlag != true) { + if (!missile[mi]._miDelFlag) { missile[mi]._misource = id; missile[mi]._mlid = AddLight(missile[mi]._mix, missile[mi]._miy, 1); missile[mi]._mirange = missile[mi]._mispllvl + (plr[id]._pLevel >> 1); @@ -3025,7 +3025,7 @@ void AddFirewallC(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 } } - if (missile[mi]._miDelFlag != true) { + if (!missile[mi]._miDelFlag) { missile[mi]._miVar7 = 0; missile[mi]._miVar8 = 0; missile[mi]._miVar3 = (midir - 2) & 7; diff --git a/Source/monster.cpp b/Source/monster.cpp index f52a0ac3c..755731428 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -4884,7 +4884,7 @@ bool PosOkMissile(int x, int y) bool CheckNoSolid(int x, int y) { - return nSolidTable[dPiece[x][y]] == false; + return !nSolidTable[dPiece[x][y]]; } bool LineClearF(bool (*Clear)(int, int), int x1, int y1, int x2, int y2) diff --git a/Source/multi.cpp b/Source/multi.cpp index bde4b77e1..33499e0c6 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -783,7 +783,7 @@ bool NetInit(bool bSinglePlayer, bool *pfExitProgram) plr[myplr].plractive = true; gbActivePlayers = 1; - if (sgbPlayerTurnBitTbl[myplr] == false || msg_wait_resync()) + if (!sgbPlayerTurnBitTbl[myplr] || msg_wait_resync()) break; NetClose(); gbSelectProvider = false; diff --git a/Source/player.cpp b/Source/player.cpp index e2c055da9..3f541a1f3 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -1959,7 +1959,7 @@ void SyncPlrKill(int pnum, int earflag) for (i = 0; i < nummissiles; i++) { ma = missileactive[i]; - if (missile[ma]._mitype == MIS_MANASHIELD && missile[ma]._misource == pnum && missile[ma]._miDelFlag == false) { + if (missile[ma]._mitype == MIS_MANASHIELD && missile[ma]._misource == pnum && !missile[ma]._miDelFlag) { if (earflag != -1) { missile[ma]._miVar8 = earflag; } diff --git a/Source/towners.cpp b/Source/towners.cpp index bdf8aeeb5..125aee321 100644 --- a/Source/towners.cpp +++ b/Source/towners.cpp @@ -963,7 +963,7 @@ void TalkToTowner(int p, int t) } } } else if (t == GetActiveTowner(TOWN_BMAID)) { - if (plr[p]._pLvlVisited[21] == false && PlrHasItem(p, IDI_MAPOFDOOM, &i)) { + if (!plr[p]._pLvlVisited[21] && PlrHasItem(p, IDI_MAPOFDOOM, &i)) { quests[Q_GRAVE]._qactive = 2; quests[Q_GRAVE]._qlog = 1; quests[Q_GRAVE]._qmsg = TEXT_GRAVE8;