From 90714cb7a4327823e305c50f9a4f92943c1c2471 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Fri, 3 Apr 2020 23:16:40 +0100 Subject: [PATCH] Apply some missing BOOL constants --- src/BossAlmo2.cpp | 6 +++--- src/BossBallos.cpp | 6 +++--- src/BossIronH.cpp | 6 +++--- src/BossOhm.cpp | 2 +- src/BossPress.cpp | 4 ++-- src/BossTwinD.cpp | 2 +- src/BossX.cpp | 2 +- src/NpcAct000.cpp | 4 ++-- src/NpcAct160.cpp | 6 +++--- src/NpcAct240.cpp | 2 +- src/NpcAct260.cpp | 2 +- src/NpcAct280.cpp | 4 ++-- src/NpcAct300.cpp | 2 +- src/TextScr.cpp | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/BossAlmo2.cpp b/src/BossAlmo2.cpp index 266b5540..8fcf6b36 100644 --- a/src/BossAlmo2.cpp +++ b/src/BossAlmo2.cpp @@ -610,7 +610,7 @@ void ActBossChar_Undead(void) for (i = 0; i < 100; ++i) SetNpChar(4, npc->x + (Random(-128, 128) * 0x200), npc->y + (Random(-64, 64) * 0x200), Random(-128, 128) * 0x200, Random(-128, 128) * 0x200, 0, NULL, 0); - DeleteNpCharCode(282, 1); + DeleteNpCharCode(282, TRUE); gBoss[11].bits &= ~NPC_SHOOTABLE; for (i = 0; i < 12; ++i) @@ -663,8 +663,8 @@ void ActBossChar_Undead(void) for (i = 0; i < 20; ++i) gBoss[i].cond = 0; - DeleteNpCharCode(158, 1); - DeleteNpCharCode(301, 1); + DeleteNpCharCode(158, TRUE); + DeleteNpCharCode(301, TRUE); } break; diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp index f5d39e43..fd2c5a03 100644 --- a/src/BossBallos.cpp +++ b/src/BossBallos.cpp @@ -469,7 +469,7 @@ void ActBossChar_Ballos(void) npc->act_wait = 0; npc->xm = 0; npc->ym = 0; - DeleteNpCharCode(339, 0); + DeleteNpCharCode(339, FALSE); // Fallthrough case 401: npc->y += ((159 * 0x200) - npc->y) / 8; @@ -674,8 +674,8 @@ void ActBossChar_Ballos(void) gBoss[4].cond = 0; gBoss[5].cond = 0; - DeleteNpCharCode(350, 1); - DeleteNpCharCode(348, 1); + DeleteNpCharCode(350, TRUE); + DeleteNpCharCode(348, TRUE); } break; diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index 816df71c..e1cc4998 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -167,9 +167,9 @@ void ActBossChar_Ironhead(void) for (i = 0; i < 0x20; ++i) SetNpChar(4, npc->x + (Random(-128, 128) * 0x200), npc->y + (Random(-64, 64) * 0x200), Random(-128, 128) * 0x200, Random(-128, 128) * 0x200, 0, NULL, 0x100); - DeleteNpCharCode(197, 1); - DeleteNpCharCode(271, 1); - DeleteNpCharCode(272, 1); + DeleteNpCharCode(197, TRUE); + DeleteNpCharCode(271, TRUE); + DeleteNpCharCode(272, TRUE); // Fallthrough case 1001: npc->tgt_x -= 1 * 0x200; diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp index 577da46a..5ebd7bf1 100644 --- a/src/BossOhm.cpp +++ b/src/BossOhm.cpp @@ -518,6 +518,6 @@ void ActBossChar_Omega(void) gBoss[0].act_wait = 0; gBoss[0].damage = 0; gBoss[5].damage = 0; - DeleteNpCharCode(48, 1); + DeleteNpCharCode(48, TRUE); } } diff --git a/src/BossPress.cpp b/src/BossPress.cpp index c219bad6..63edd596 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -152,8 +152,8 @@ void ActBossChar_Press(void) npc->act_wait = 0; npc->count1 = 0; - DeleteNpCharCode(325, 1); - DeleteNpCharCode(330, 1); + DeleteNpCharCode(325, TRUE); + DeleteNpCharCode(330, TRUE); // Fallthrough case 501: if (++npc->act_wait % 0x10 == 0) diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index c50d4654..5e9cac15 100644 --- a/src/BossTwinD.cpp +++ b/src/BossTwinD.cpp @@ -524,7 +524,7 @@ void ActBossChar_Twin(void) case 1020: if (++gBoss[0].act_wait > 50) { - DeleteNpCharCode(211, 1); + DeleteNpCharCode(211, TRUE); gBoss[0].cond = 0; gBoss[1].cond = 0; gBoss[2].cond = 0; diff --git a/src/BossX.cpp b/src/BossX.cpp index d107a886..b17128b3 100644 --- a/src/BossX.cpp +++ b/src/BossX.cpp @@ -858,7 +858,7 @@ void ActBossChar_MonstX(void) for (i = 0; i < 20; ++i) gBoss[i].cond = 0; - DeleteNpCharCode(158, 1); + DeleteNpCharCode(158, TRUE); SetNpChar(159, npc->x, npc->y - (24 * 0x200), 0, 0, 0, NULL, 0); } diff --git a/src/NpcAct000.cpp b/src/NpcAct000.cpp index 901e0691..7afc6b01 100644 --- a/src/NpcAct000.cpp +++ b/src/NpcAct000.cpp @@ -1314,8 +1314,8 @@ void ActNpc012(NPCHAR *npc) npc->ani_no = 3; npc->ym = -0x800; npc->bits |= NPC_IGNORE_SOLIDITY; - DeleteNpCharCode(150, 0); - DeleteNpCharCode(117, 0); + DeleteNpCharCode(150, FALSE); + DeleteNpCharCode(117, FALSE); SetNpChar(355, 0, 0, 0, 0, 0, npc, 0x100); SetNpChar(355, 0, 0, 0, 0, 1, npc, 0x100); } diff --git a/src/NpcAct160.cpp b/src/NpcAct160.cpp index a4dc6f80..debee189 100644 --- a/src/NpcAct160.cpp +++ b/src/NpcAct160.cpp @@ -51,7 +51,7 @@ void ActNpc160(NPCHAR *npc) if (npc->flag & 8) { - DeleteNpCharCode(161, 1); + DeleteNpCharCode(161, TRUE); for (i = 0; i < 4; ++i) SetNpChar(4, npc->x + (Random(-12, 12) * 0x200), npc->y + (Random(-12, 12) * 0x200), Random(-341, 341), Random(-0x600, 0), 0, NULL, 0x100); @@ -245,7 +245,7 @@ void ActNpc162(NPCHAR *npc) switch (npc->act_no) { case 0: - DeleteNpCharCode(161, 1); + DeleteNpCharCode(161, TRUE); PlaySoundObject(72, 1); for (i = 0; i < 10; ++i) @@ -315,7 +315,7 @@ void ActNpc162(NPCHAR *npc) if (++npc->count1 < 60) break; - DeleteNpCharCode(161, 1); + DeleteNpCharCode(161, TRUE); npc->cond = 0; break; diff --git a/src/NpcAct240.cpp b/src/NpcAct240.cpp index a92a310e..902f1d8d 100644 --- a/src/NpcAct240.cpp +++ b/src/NpcAct240.cpp @@ -778,7 +778,7 @@ void ActNpc247(NPCHAR *npc) npc->xm = 0; npc->ym = 0; - DeleteNpCharCode(252, 1); + DeleteNpCharCode(252, TRUE); SetNpChar(4, npc->x, npc->y, 0, 0, 0, NULL, 0x100); SetNpChar(4, npc->x, npc->y, 0, 0, 0, NULL, 0x100); diff --git a/src/NpcAct260.cpp b/src/NpcAct260.cpp index fe7e81e2..9285a3af 100644 --- a/src/NpcAct260.cpp +++ b/src/NpcAct260.cpp @@ -1003,7 +1003,7 @@ void ActNpc267(NPCHAR *npc) break; case 500: - DeleteNpCharCode(269, 1); + DeleteNpCharCode(269, TRUE); npc->bits &= ~NPC_SHOOTABLE; npc->ani_no = 4; npc->ym += 0x20; diff --git a/src/NpcAct280.cpp b/src/NpcAct280.cpp index 111902e3..a194993c 100644 --- a/src/NpcAct280.cpp +++ b/src/NpcAct280.cpp @@ -116,7 +116,7 @@ void ActNpc281(NPCHAR *npc) case 21: if (++npc->act_wait > 250) { - DeleteNpCharCode(270, 0); + DeleteNpCharCode(270, FALSE); npc->act_no = 22; } @@ -689,7 +689,7 @@ void ActNpc284(NPCHAR *npc) npc->view.top = 16 * 0x200; npc->view.back = 16 * 0x200; npc->view.front = 16 * 0x200; - DeleteNpCharCode(257, 1); + DeleteNpCharCode(257, TRUE); break; case 20: diff --git a/src/NpcAct300.cpp b/src/NpcAct300.cpp index 3ee8e87e..7e1fe5ae 100644 --- a/src/NpcAct300.cpp +++ b/src/NpcAct300.cpp @@ -1339,7 +1339,7 @@ void ActNpc313(NPCHAR *npc) npc->ani_no = 8; npc->tgt_x = npc->x; npc->damage = 0; - DeleteNpCharCode(315, 1); + DeleteNpCharCode(315, TRUE); // Fallthrough case 501: npc->ym += 0x20; diff --git a/src/TextScr.cpp b/src/TextScr.cpp index 809ec0e5..96c15e99 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -1092,7 +1092,7 @@ int TextScriptProc(void) else if (IS_COMMAND('D','N','A')) { z = GetTextScriptNo(gTS.p_read + 4); - DeleteNpCharCode(z, 1); + DeleteNpCharCode(z, TRUE); gTS.p_read += 8; } else if (IS_COMMAND('B','O','A'))