shithub: cstory

Info  •  Files  •  Log  •  Branches

Apply some missing BOOL constants

--- a/src/BossAlmo2.cpp

+++ b/src/BossAlmo2.cpp

@@ -610,7 +610,7 @@

 			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 @@

 				for (i = 0; i < 20; ++i)

 					gBoss[i].cond = 0;

-				DeleteNpCharCode(158, 1);

-				DeleteNpCharCode(301, 1);

+				DeleteNpCharCode(158, TRUE);

+				DeleteNpCharCode(301, TRUE);

 			}

 			break;

--- a/src/BossBallos.cpp

+++ b/src/BossBallos.cpp

@@ -469,7 +469,7 @@

 			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 @@

 				gBoss[4].cond = 0;

 				gBoss[5].cond = 0;

-				DeleteNpCharCode(350, 1);

-				DeleteNpCharCode(348, 1);

+				DeleteNpCharCode(350, TRUE);

+				DeleteNpCharCode(348, TRUE);

 			}

 			break;

--- a/src/BossIronH.cpp

+++ b/src/BossIronH.cpp

@@ -167,9 +167,9 @@

 			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;

--- a/src/BossOhm.cpp

+++ b/src/BossOhm.cpp

@@ -518,6 +518,6 @@

 		gBoss[0].act_wait = 0;

 		gBoss[0].damage = 0;

 		gBoss[5].damage = 0;

-		DeleteNpCharCode(48, 1);

+		DeleteNpCharCode(48, TRUE);

 	}

 }

--- a/src/BossPress.cpp

+++ b/src/BossPress.cpp

@@ -152,8 +152,8 @@

 			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)

--- a/src/BossTwinD.cpp

+++ b/src/BossTwinD.cpp

@@ -524,7 +524,7 @@

 		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;

--- a/src/BossX.cpp

+++ b/src/BossX.cpp

@@ -858,7 +858,7 @@

 				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);

 			}

--- a/src/NpcAct000.cpp

+++ b/src/NpcAct000.cpp

@@ -1314,8 +1314,8 @@

 				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);

 			}

--- a/src/NpcAct160.cpp

+++ b/src/NpcAct160.cpp

@@ -51,7 +51,7 @@

 			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 @@

 	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 @@

 			if (++npc->count1 < 60)

 				break;

-			DeleteNpCharCode(161, 1);

+			DeleteNpCharCode(161, TRUE);

 			npc->cond = 0;

 			break;

--- a/src/NpcAct240.cpp

+++ b/src/NpcAct240.cpp

@@ -778,7 +778,7 @@

 			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);

--- a/src/NpcAct260.cpp

+++ b/src/NpcAct260.cpp

@@ -1003,7 +1003,7 @@

 			break;

 		case 500:

-			DeleteNpCharCode(269, 1);

+			DeleteNpCharCode(269, TRUE);

 			npc->bits &= ~NPC_SHOOTABLE;

 			npc->ani_no = 4;

 			npc->ym += 0x20;

--- a/src/NpcAct280.cpp

+++ b/src/NpcAct280.cpp

@@ -116,7 +116,7 @@

 		case 21:

 			if (++npc->act_wait > 250)

 			{

-				DeleteNpCharCode(270, 0);

+				DeleteNpCharCode(270, FALSE);

 				npc->act_no = 22;

 			}

@@ -689,7 +689,7 @@

 			npc->view.top = 16 * 0x200;

 			npc->view.back = 16 * 0x200;

 			npc->view.front = 16 * 0x200;

-			DeleteNpCharCode(257, 1);

+			DeleteNpCharCode(257, TRUE);

 			break;

 		case 20:

--- a/src/NpcAct300.cpp

+++ b/src/NpcAct300.cpp

@@ -1339,7 +1339,7 @@

 			npc->ani_no = 8;

 			npc->tgt_x = npc->x;

 			npc->damage = 0;

-			DeleteNpCharCode(315, 1);

+			DeleteNpCharCode(315, TRUE);

 			// Fallthrough

 		case 501:

 			npc->ym += 0x20;

--- a/src/TextScr.cpp

+++ b/src/TextScr.cpp

@@ -1092,7 +1092,7 @@

 					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'))

-- 

⑨