shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/src/NpcAct160.cpp

+++ b/src/NpcAct160.cpp

@@ -1334,7 +1334,7 @@

 	if (npc->act_no < 3 && npc->life < 90)

 	{

-		LoseNpChar(npc, 0);

+		LoseNpChar(npc, FALSE);

 		npc->act_no = 10;

 		npc->ani_no = 1;

 		npc->bits &= ~NPC_SHOOTABLE;

@@ -1384,7 +1384,7 @@

 	if (npc->act_no < 3 && npc->life < 940)

 	{

-		LoseNpChar(npc, 0);

+		LoseNpChar(npc, FALSE);

 		npc->act_no = 10;

 		npc->ani_no = 2;

 		npc->bits &= ~NPC_SHOOTABLE;

--- a/src/NpcAct180.cpp

+++ b/src/NpcAct180.cpp

@@ -1311,7 +1311,7 @@

 			if (npc->x < 48 * 0x200)

 			{

 				npc->destroy_voice = 0;

-				LoseNpChar(npc, 1);

+				LoseNpChar(npc, TRUE);

 			}

 			break;

-- 

⑨