duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-07-08 03:06:28 +01:00
commit 1733b58b3a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/NpcAct160.cpp
View file

@ -1334,7 +1334,7 @@ void ActNpc175(NPCHAR *npc)
if (npc->act_no < 3 && npc->life < 90) if (npc->act_no < 3 && npc->life < 90)
{ {
LoseNpChar(npc, 0); LoseNpChar(npc, FALSE);
npc->act_no = 10; npc->act_no = 10;
npc->ani_no = 1; npc->ani_no = 1;
npc->bits &= ~NPC_SHOOTABLE; npc->bits &= ~NPC_SHOOTABLE;
@ -1384,7 +1384,7 @@ void ActNpc176(NPCHAR *npc)
if (npc->act_no < 3 && npc->life < 940) if (npc->act_no < 3 && npc->life < 940)
{ {
LoseNpChar(npc, 0); LoseNpChar(npc, FALSE);
npc->act_no = 10; npc->act_no = 10;
npc->ani_no = 2; npc->ani_no = 2;
npc->bits &= ~NPC_SHOOTABLE; npc->bits &= ~NPC_SHOOTABLE;

2
src/NpcAct180.cpp
View file

@ -1311,7 +1311,7 @@ void ActNpc197(NPCHAR *npc)
if (npc->x < 48 * 0x200) if (npc->x < 48 * 0x200)
{ {
npc->destroy_voice = 0; npc->destroy_voice = 0;
LoseNpChar(npc, 1); LoseNpChar(npc, TRUE);
} }
break; break;