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

Clean-up ActNpc169

Browse source
This commit is contained in:
Clownacy 2019-11-17 17:53:58 +00:00
parent dabf04f8ab
commit 87f74bcb6b
1 changed files with 43 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/NpcAct160.cpp
View file

@ -609,7 +609,7 @@ void ActNpc169(NPCHAR *npc)
npc->direct = 2; npc->direct = 2;
// Fallthrough // Fallthrough
case 1: case 1:
if (--npc->act_wait) if (--npc->act_wait != 0)
break; break;
npc->act_no = 2; npc->act_no = 2;
@ -623,7 +623,9 @@ void ActNpc169(NPCHAR *npc)
npc->ani_wait = 0; npc->ani_wait = 0;
// Fallthrough // Fallthrough
case 3: case 3:
if (++npc->ani_wait > 3) ++npc->ani_wait;
if (npc->ani_wait > 3)
{ {
npc->ani_wait = 0; npc->ani_wait = 0;
++npc->ani_no; ++npc->ani_no;
@ -648,47 +650,43 @@ void ActNpc169(NPCHAR *npc)
DamageMyChar(5); DamageMyChar(5);
break; break;
} }
else
++npc->act_wait;
if (npc->act_wait > 75)
{ {
if (++npc->act_wait > 75) npc->act_no = 9;
npc->ani_no = 0;
break;
}
if (npc->flag & 5)
{
if (npc->count2 < 5)
{ {
npc->act_no = 9; ++npc->count2;
npc->ani_no = 0;
break;
} }
else else
{ {
if (npc->flag & 5) npc->act_no = 4;
{ npc->act_wait = 0;
if (npc->count2 < 5) npc->ani_no = 7;
{ npc->ym = -0x5FF;
++npc->count2;
}
else
{
npc->act_no = 4;
npc->act_wait = 0;
npc->ani_no = 7;
npc->ym = -0x5FF;
}
}
else
{
npc->count2 = 0;
}
if (npc->count1 % 2 == 0 && npc->act_wait > 25)
{
npc->act_no = 4;
npc->act_wait = 0;
npc->ani_no = 7;
npc->ym = -0x5FF;
break;
}
break;
} }
} }
else
{
npc->count2 = 0;
}
if (npc->count1 % 2 == 0 && npc->act_wait > 25)
{
npc->act_no = 4;
npc->act_wait = 0;
npc->ani_no = 7;
npc->ym = -0x5FF;
break;
}
break; break;
@ -752,7 +750,9 @@ void ActNpc169(NPCHAR *npc)
gMC.x = npc->x; gMC.x = npc->x;
gMC.y = npc->y; gMC.y = npc->y;
if (++npc->ani_wait > 2) ++npc->ani_wait;
if (npc->ani_wait > 2)
{ {
npc->ani_wait = 0; npc->ani_wait = 0;
++npc->ani_no; ++npc->ani_no;
@ -761,7 +761,9 @@ void ActNpc169(NPCHAR *npc)
if (npc->ani_no > 6) if (npc->ani_no > 6)
npc->ani_no = 5; npc->ani_no = 5;
if (++npc->act_wait > 100) ++npc->act_wait;
if (npc->act_wait > 100)
npc->act_no = 20; npc->act_no = 20;
break; break;
@ -794,7 +796,9 @@ void ActNpc169(NPCHAR *npc)
npc->ani_no = 7; npc->ani_no = 7;
// Fallthrough // Fallthrough
case 21: case 21:
if (++npc->act_wait < 50) ++npc->act_wait;
if (npc->act_wait < 50)
break; break;
npc->act_no = 0; npc->act_no = 0;