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

Clean up NpcAct180.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-15 19:36:45 +02:00
parent edaf94f3c2
commit 6d462c6fc6
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/NpcAct180.cpp
View file

@ -594,12 +594,15 @@ void ActNpc184(NPCHAR *npc)
case 0: case 0:
npc->x -= 0x80; npc->x -= 0x80;
break; break;
case 1: case 1:
npc->y -= 0x80; npc->y -= 0x80;
break; break;
case 2: case 2:
npc->x += 0x80; npc->x += 0x80;
break; break;
case 3: case 3:
npc->y += 0x80; npc->y += 0x80;
break; break;
@ -642,6 +645,7 @@ void ActNpc185(NPCHAR *npc)
npc->act_no = 1; npc->act_no = 1;
npc->y += 0x1000; npc->y += 0x1000;
break; break;
case 10: case 10:
npc->act_no = 11; npc->act_no = 11;
npc->ani_no = 1; npc->ani_no = 1;
@ -654,18 +658,22 @@ void ActNpc185(NPCHAR *npc)
case 0: case 0:
npc->x -= 0x80; npc->x -= 0x80;
break; break;
case 1: case 1:
npc->y -= 0x80; npc->y -= 0x80;
break; break;
case 2: case 2:
npc->x += 0x80; npc->x += 0x80;
break; break;
case 3: case 3:
npc->y += 0x80; npc->y += 0x80;
break; break;
} }
++npc->act_wait; ++npc->act_wait;
break; break;
case 20: case 20:
npc->y -= 0x3000; npc->y -= 0x3000;
npc->act_no = 1; npc->act_no = 1;
@ -692,6 +700,7 @@ void ActNpc186(NPCHAR *npc)
// Fallthrough // Fallthrough
case 1: case 1:
break; break;
case 10: case 10:
npc->act_no = 11; npc->act_no = 11;
npc->ani_no = 1; npc->ani_no = 1;
@ -704,12 +713,15 @@ void ActNpc186(NPCHAR *npc)
case 0: case 0:
npc->x -= 0x80; npc->x -= 0x80;
break; break;
case 1: case 1:
npc->y -= 0x80; npc->y -= 0x80;
break; break;
case 2: case 2:
npc->x += 0x80; npc->x += 0x80;
break; break;
case 3: case 3:
npc->y += 0x80; npc->y += 0x80;
break; break;
@ -968,12 +980,14 @@ void ActNpc190(NPCHAR *npc)
case 0: case 0:
npc->ani_no = 0; npc->ani_no = 0;
break; break;
case 10: case 10:
PlaySoundObject(72, 1); PlaySoundObject(72, 1);
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
SetNpChar(4, npc->x, npc->y + (Random(-8, 8) << 9), Random(-8, -2) << 9, Random(-3, 3) << 9, 0, 0, 0x100); SetNpChar(4, npc->x, npc->y + (Random(-8, 8) << 9), Random(-8, -2) << 9, Random(-3, 3) << 9, 0, 0, 0x100);
npc->cond = 0; npc->cond = 0;
break; break;
case 20: case 20:
if (++npc->ani_wait > 10) if (++npc->ani_wait > 10)
{ {
@ -1011,6 +1025,7 @@ void ActNpc191(NPCHAR *npc)
npc->y += npc->ym; npc->y += npc->ym;
break; break;
case 20: case 20:
npc->act_no = 21; npc->act_no = 21;
npc->act_wait = 0; npc->act_wait = 0;
@ -1371,12 +1386,15 @@ void ActNpc199(NPCHAR *npc)
case 0: case 0:
npc->xm = -1; npc->xm = -1;
break; break;
case 1: case 1:
npc->ym = -1; npc->ym = -1;
break; break;
case 2: case 2:
npc->xm = 1; npc->xm = 1;
break; break;
case 3: case 3:
npc->ym = 1; npc->ym = 1;
break; break;