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

Cleaned up NpcAct320.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-16 08:21:52 +02:00
parent e5b499ee67
commit c247de7686
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/NpcAct320.cpp
View file

@ -14,7 +14,7 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
//Curly (carried, shooting) // Curly (carried, shooting)
void ActNpc320(NPCHAR *npc) void ActNpc320(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -104,7 +104,7 @@ void ActNpc320(NPCHAR *npc)
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
} }
//Curly's Nemesis // Curly's Nemesis
void ActNpc321(NPCHAR *npc) void ActNpc321(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -177,7 +177,7 @@ void ActNpc321(NPCHAR *npc)
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
} }
//Deleet // Deleet
void ActNpc322(NPCHAR *npc) void ActNpc322(NPCHAR *npc)
{ {
RECT rc[3] = { RECT rc[3] = {
@ -222,18 +222,23 @@ void ActNpc322(NPCHAR *npc)
case 0: case 0:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 0, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 0, 0, 0x180);
break; break;
case 50: case 50:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 1, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 1, 0, 0x180);
break; break;
case 100: case 100:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 2, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 2, 0, 0x180);
break; break;
case 150: case 150:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 3, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 3, 0, 0x180);
break; break;
case 200: case 200:
SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 4, 0, 0x180); SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 4, 0, 0x180);
break; break;
case 250: case 250:
npc->hit.back = 0x6000; npc->hit.back = 0x6000;
npc->hit.front = 0x6000; npc->hit.front = 0x6000;
@ -265,7 +270,7 @@ void ActNpc322(NPCHAR *npc)
} }
} }
//Bute (spinning) // Bute (spinning)
void ActNpc323(NPCHAR *npc) void ActNpc323(NPCHAR *npc)
{ {
RECT rc[4] = { RECT rc[4] = {
@ -293,12 +298,15 @@ void ActNpc323(NPCHAR *npc)
case 0: case 0:
npc->xm = -0x600; npc->xm = -0x600;
break; break;
case 2: case 2:
npc->xm = 0x600; npc->xm = 0x600;
break; break;
case 1: case 1:
npc->ym = -0x600; npc->ym = -0x600;
break; break;
case 3: case 3:
npc->ym = 0x600; npc->ym = 0x600;
break; break;
@ -322,14 +330,17 @@ void ActNpc323(NPCHAR *npc)
if (npc->x <= gMC.x + 0x4000) if (npc->x <= gMC.x + 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 2: case 2:
if (npc->x >= gMC.x - 0x4000) if (npc->x >= gMC.x - 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 1: case 1:
if (npc->y <= gMC.y + 0x4000) if (npc->y <= gMC.y + 0x4000)
npc->act_no = 10; npc->act_no = 10;
break; break;
case 3: case 3:
if (npc->y >= gMC.y - 0x4000) if (npc->y >= gMC.y - 0x4000)
npc->act_no = 10; npc->act_no = 10;
@ -354,7 +365,7 @@ void ActNpc323(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Bute generator // Bute generator
void ActNpc324(NPCHAR *npc) void ActNpc324(NPCHAR *npc)
{ {
switch (npc->act_no) switch (npc->act_no)
@ -374,7 +385,7 @@ void ActNpc324(NPCHAR *npc)
} }
} }
//Heavy Press lightning // Heavy Press lightning
void ActNpc325(NPCHAR *npc) void ActNpc325(NPCHAR *npc)
{ {
RECT rc[7] = { RECT rc[7] = {
@ -436,7 +447,7 @@ void ActNpc325(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Sue/Itoh becoming humans // Sue/Itoh becoming humans
void ActNpc326(NPCHAR *npc) void ActNpc326(NPCHAR *npc)
{ {
switch (npc->act_no) switch (npc->act_no)
@ -446,7 +457,7 @@ void ActNpc326(NPCHAR *npc)
npc->y -= 0x1000; npc->y -= 0x1000;
npc->x += 0x2000; npc->x += 0x2000;
npc->ani_no = 0; npc->ani_no = 0;
//Fallthrough // Fallthrough
case 1: case 1:
if (++npc->act_wait > 80) if (++npc->act_wait > 80)
{ {
@ -540,7 +551,7 @@ void ActNpc326(NPCHAR *npc)
npc->act_no = 41; npc->act_no = 41;
npc->act_wait = 0; npc->act_wait = 0;
npc->ani_no = 0; npc->ani_no = 0;
//Fallthrough // Fallthrough
case 41: case 41:
if (++npc->act_wait == 30) if (++npc->act_wait == 30)
npc->ani_no = 1; npc->ani_no = 1;
@ -579,7 +590,7 @@ void ActNpc326(NPCHAR *npc)
npc->rect = rcSu[npc->ani_no]; npc->rect = rcSu[npc->ani_no];
} }
//Sneeze // Sneeze
void ActNpc327(NPCHAR *npc) void ActNpc327(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -624,14 +635,14 @@ void ActNpc327(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Thingy that turns Sue and Itoh into humans for 4 seconds // Thingy that turns Sue and Itoh into humans for 4 seconds
void ActNpc328(NPCHAR *npc) void ActNpc328(NPCHAR *npc)
{ {
RECT rc = {96, 0, 128, 48}; RECT rc = {96, 0, 128, 48};
npc->rect = rc; npc->rect = rc;
} }
//Laboratory fan // Laboratory fan
void ActNpc329(NPCHAR *npc) void ActNpc329(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -645,7 +656,7 @@ void ActNpc329(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Rolling // Rolling
void ActNpc330(NPCHAR *npc) void ActNpc330(NPCHAR *npc)
{ {
RECT rc[3] = { RECT rc[3] = {
@ -728,7 +739,7 @@ void ActNpc330(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Ballos bone projectile // Ballos bone projectile
void ActNpc331(NPCHAR *npc) void ActNpc331(NPCHAR *npc)
{ {
RECT rc[4] = { RECT rc[4] = {
@ -787,7 +798,7 @@ void ActNpc331(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Ballos shockwave // Ballos shockwave
void ActNpc332(NPCHAR *npc) void ActNpc332(NPCHAR *npc)
{ {
int xm; int xm;
@ -843,7 +854,7 @@ void ActNpc332(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Ballos lightning // Ballos lightning
void ActNpc333(NPCHAR *npc) void ActNpc333(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -879,7 +890,7 @@ void ActNpc333(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Sweat // Sweat
void ActNpc334(NPCHAR *npc) void ActNpc334(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -926,7 +937,7 @@ void ActNpc334(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Ikachan // Ikachan
void ActNpc335(NPCHAR *npc) void ActNpc335(NPCHAR *npc)
{ {
RECT rc[3] = { RECT rc[3] = {
@ -982,7 +993,7 @@ void ActNpc335(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Ikachan generator // Ikachan generator
void ActNpc336(NPCHAR *npc) void ActNpc336(NPCHAR *npc)
{ {
int y; int y;
@ -996,7 +1007,7 @@ void ActNpc336(NPCHAR *npc)
break; break;
case 10: case 10:
if (++npc->act_wait % 4 == 1 ) if (++npc->act_wait % 4 == 1)
{ {
y = npc->y + (Random(0, 13) * 0x200 * 0x10); y = npc->y + (Random(0, 13) * 0x200 * 0x10);
SetNpChar(335, npc->x, y, 0, 0, 0, 0, 0); SetNpChar(335, npc->x, y, 0, 0, 0, 0, 0);
@ -1006,7 +1017,7 @@ void ActNpc336(NPCHAR *npc)
} }
} }
//Numhachi // Numhachi
void ActNpc337(NPCHAR *npc) void ActNpc337(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -1048,7 +1059,7 @@ void ActNpc337(NPCHAR *npc)
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
} }
//Green Devil // Green Devil
void ActNpc338(NPCHAR *npc) void ActNpc338(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -1115,7 +1126,7 @@ void ActNpc338(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Green Devil generator // Green Devil generator
void ActNpc339(NPCHAR *npc) void ActNpc339(NPCHAR *npc)
{ {
switch (npc->act_no) switch (npc->act_no)