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

Cleaned up NpcAct220.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-15 21:18:34 +02:00
parent 5412390860
commit 6c5aea8a2c
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/NpcAct220.cpp
View file

@ -12,7 +12,7 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
//Shovel Brigade // Shovel Brigade
void ActNpc220(NPCHAR *npc) void ActNpc220(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -58,7 +58,7 @@ void ActNpc220(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Shovel Brigade (walking) // Shovel Brigade (walking)
void ActNpc221(NPCHAR *npc) void ActNpc221(NPCHAR *npc)
{ {
RECT rcLeft[6] = { RECT rcLeft[6] = {
@ -127,7 +127,7 @@ void ActNpc221(NPCHAR *npc)
case 11: case 11:
if (npc->direct == 0 && npc->flag & 1) if (npc->direct == 0 && npc->flag & 1)
npc->direct = 2; npc->direct = 2;
else if ( npc->direct == 2 && npc->flag & 4 ) else if (npc->direct == 2 && npc->flag & 4)
npc->direct = 0; npc->direct = 0;
if (npc->direct == 0) if (npc->direct == 0)
@ -163,7 +163,7 @@ void ActNpc221(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Prison bars // Prison bars
void ActNpc222(NPCHAR *npc) void ActNpc222(NPCHAR *npc)
{ {
RECT rc = {96, 168, 112, 200}; RECT rc = {96, 168, 112, 200};
@ -177,7 +177,7 @@ void ActNpc222(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Momorin // Momorin
void ActNpc223(NPCHAR *npc) void ActNpc223(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -237,7 +237,7 @@ void ActNpc223(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Chie // Chie
void ActNpc224(NPCHAR *npc) void ActNpc224(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -268,7 +268,7 @@ void ActNpc224(NPCHAR *npc)
break; break;
case 2: case 2:
if (++npc->act_wait > 12 ) if (++npc->act_wait > 12)
{ {
npc->act_no = 1; npc->act_no = 1;
npc->ani_no = 0; npc->ani_no = 0;
@ -291,7 +291,7 @@ void ActNpc224(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Megane // Megane
void ActNpc225(NPCHAR *npc) void ActNpc225(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -322,7 +322,7 @@ void ActNpc225(NPCHAR *npc)
break; break;
case 2: case 2:
if (++npc->act_wait > 12 ) if (++npc->act_wait > 12)
{ {
npc->act_no = 1; npc->act_no = 1;
npc->ani_no = 0; npc->ani_no = 0;
@ -337,7 +337,7 @@ void ActNpc225(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Kanpachi // Kanpachi
void ActNpc226(NPCHAR *npc) void ActNpc226(NPCHAR *npc)
{ {
RECT rcRight[7] = { RECT rcRight[7] = {
@ -413,14 +413,14 @@ void ActNpc226(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Bucket // Bucket
void ActNpc227(NPCHAR *npc) void ActNpc227(NPCHAR *npc)
{ {
RECT rc = {208, 32, 224, 48}; RECT rc = {208, 32, 224, 48};
npc->rect = rc; npc->rect = rc;
} }
//Droll (guard) // Droll (guard)
void ActNpc228(NPCHAR *npc) void ActNpc228(NPCHAR *npc)
{ {
RECT rcLeft[4] = { RECT rcLeft[4] = {
@ -517,7 +517,7 @@ void ActNpc228(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Red Flowers (sprouts) // Red Flowers (sprouts)
void ActNpc229(NPCHAR *npc) void ActNpc229(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -539,7 +539,7 @@ void ActNpc229(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Red Flowers (blooming) // Red Flowers (blooming)
void ActNpc230(NPCHAR *npc) void ActNpc230(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -562,7 +562,7 @@ void ActNpc230(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Rocket // Rocket
void ActNpc231(NPCHAR *npc) void ActNpc231(NPCHAR *npc)
{ {
int i; int i;
@ -674,7 +674,7 @@ void ActNpc231(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Orangebell // Orangebell
void ActNpc232(NPCHAR *npc) void ActNpc232(NPCHAR *npc)
{ {
int i; int i;
@ -744,7 +744,7 @@ void ActNpc232(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Orangebell bat // Orangebell bat
void ActNpc233(NPCHAR *npc) void ActNpc233(NPCHAR *npc)
{ {
unsigned char deg; unsigned char deg;
@ -861,7 +861,7 @@ void ActNpc233(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Red Flowers (picked) // Red Flowers (picked)
void ActNpc234(NPCHAR *npc) void ActNpc234(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -883,7 +883,7 @@ void ActNpc234(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Midorin // Midorin
void ActNpc235(NPCHAR *npc) void ActNpc235(NPCHAR *npc)
{ {
RECT rcLeft[4] = { RECT rcLeft[4] = {
@ -989,7 +989,7 @@ void ActNpc235(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Gunfish // Gunfish
void ActNpc236(NPCHAR *npc) void ActNpc236(NPCHAR *npc)
{ {
RECT rcLeft[6] = { RECT rcLeft[6] = {
@ -1123,7 +1123,7 @@ void ActNpc236(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Gunfish projectile // Gunfish projectile
void ActNpc237(NPCHAR *npc) void ActNpc237(NPCHAR *npc)
{ {
int i; int i;
@ -1264,7 +1264,7 @@ void ActNpc238(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Cage bars // Cage bars
void ActNpc239(NPCHAR *npc) void ActNpc239(NPCHAR *npc)
{ {
RECT rcLeft = {192, 48, 256, 80}; RECT rcLeft = {192, 48, 256, 80};