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

Did formatting for NpcAct120.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-14 09:40:56 +02:00
parent 9b3b7039da
commit 601e511bff
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/NpcAct120.cpp
View file

@ -13,7 +13,7 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
//Colon (1) // Colon (1)
void ActNpc120(NPCHAR *npc) void ActNpc120(NPCHAR *npc)
{ {
RECT rect[2] = { RECT rect[2] = {
@ -27,7 +27,7 @@ void ActNpc120(NPCHAR *npc)
npc->rect = rect[1]; npc->rect = rect[1];
} }
//Colon (2) // Colon (2)
void ActNpc121(NPCHAR *npc) void ActNpc121(NPCHAR *npc)
{ {
RECT rect[3] = { RECT rect[3] = {
@ -78,7 +78,7 @@ void ActNpc121(NPCHAR *npc)
} }
} }
//Colon (attacking) // Colon (attacking)
void ActNpc122(NPCHAR *npc) void ActNpc122(NPCHAR *npc)
{ {
RECT rcLeft[10] = { RECT rcLeft[10] = {
@ -255,7 +255,7 @@ void ActNpc122(NPCHAR *npc)
if (npc->xm < -0x1FF) if (npc->xm < -0x1FF)
npc->xm = -0x1FF; npc->xm = -0x1FF;
if (npc->ym > 0x5FF ) if (npc->ym > 0x5FF)
npc->ym = 0x5FF; npc->ym = 0x5FF;
npc->y += npc->ym; npc->y += npc->ym;
@ -267,7 +267,7 @@ void ActNpc122(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Curly boss projectile // Curly boss projectile
void ActNpc123(NPCHAR *npc) void ActNpc123(NPCHAR *npc)
{ {
RECT rect[4] = { RECT rect[4] = {
@ -292,14 +292,17 @@ void ActNpc123(NPCHAR *npc)
npc->xm = -0x1000; npc->xm = -0x1000;
npc->ym = Random(-0x80, 0x80); npc->ym = Random(-0x80, 0x80);
break; break;
case 1: case 1:
npc->ym = -0x1000; npc->ym = -0x1000;
npc->xm = Random(-0x80, 0x80); npc->xm = Random(-0x80, 0x80);
break; break;
case 2: case 2:
npc->xm = 0x1000; npc->xm = 0x1000;
npc->ym = Random(-0x80, 0x80); npc->ym = Random(-0x80, 0x80);
break; break;
case 3: case 3:
npc->ym = 0x1000; npc->ym = 0x1000;
npc->xm = Random(-0x80, 0x80); npc->xm = Random(-0x80, 0x80);
@ -315,14 +318,17 @@ void ActNpc123(NPCHAR *npc)
if (npc->flag & 1) if (npc->flag & 1)
bBreak = TRUE; bBreak = TRUE;
break; break;
case 1: case 1:
if (npc->flag & 2) if (npc->flag & 2)
bBreak = TRUE; bBreak = TRUE;
break; break;
case 2: case 2:
if (npc->flag & 4) if (npc->flag & 4)
bBreak = TRUE; bBreak = TRUE;
break; break;
case 3: case 3:
if (npc->flag & 8) if (npc->flag & 8)
bBreak = TRUE; bBreak = TRUE;
@ -345,7 +351,7 @@ void ActNpc123(NPCHAR *npc)
npc->rect = rect[npc->direct]; npc->rect = rect[npc->direct];
} }
//Sunstone // Sunstone
void ActNpc124(NPCHAR *npc) void ActNpc124(NPCHAR *npc)
{ {
RECT rect[2] = { RECT rect[2] = {
@ -377,12 +383,15 @@ void ActNpc124(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;
@ -397,7 +406,7 @@ void ActNpc124(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
//Hidden item // Hidden item
void ActNpc125(NPCHAR *npc) void ActNpc125(NPCHAR *npc)
{ {
if (npc->life < 990) if (npc->life < 990)
@ -424,7 +433,7 @@ void ActNpc125(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Puppy (running) // Puppy (running)
void ActNpc126(NPCHAR *npc) void ActNpc126(NPCHAR *npc)
{ {
RECT rcLeft[6] = { RECT rcLeft[6] = {
@ -556,7 +565,7 @@ void ActNpc126(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Machine gun trail (Level 2) // Machine gun trail (Level 2)
void ActNpc127(NPCHAR *npc) void ActNpc127(NPCHAR *npc)
{ {
RECT rcV[3] = { RECT rcV[3] = {
@ -584,7 +593,7 @@ void ActNpc127(NPCHAR *npc)
npc->rect = rcV[npc->ani_no]; npc->rect = rcV[npc->ani_no];
} }
//Machine gun trail (Level 3) // Machine gun trail (Level 3)
void ActNpc128(NPCHAR *npc) void ActNpc128(NPCHAR *npc)
{ {
RECT rcLeft[5] = { RECT rcLeft[5] = {
@ -643,19 +652,22 @@ void ActNpc128(NPCHAR *npc)
case 0: case 0:
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
break; break;
case 1: case 1:
npc->rect = rcUp[npc->ani_no]; npc->rect = rcUp[npc->ani_no];
break; break;
case 2: case 2:
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
break; break;
case 3: case 3:
npc->rect = rcDown[npc->ani_no]; npc->rect = rcDown[npc->ani_no];
break; break;
} }
} }
//Fireball trail (Level 2 & 3) // Fireball trail (Level 2 & 3)
void ActNpc129(NPCHAR *npc) void ActNpc129(NPCHAR *npc)
{ {
RECT rect[18] = { RECT rect[18] = {
@ -691,7 +703,7 @@ void ActNpc129(NPCHAR *npc)
npc->rect = rect[3 * npc->direct + npc->ani_no]; npc->rect = rect[3 * npc->direct + npc->ani_no];
} }
//Puppy (sitting, wagging tail) // Puppy (sitting, wagging tail)
void ActNpc130(NPCHAR *npc) void ActNpc130(NPCHAR *npc)
{ {
RECT rcLeft[4] = { RECT rcLeft[4] = {
@ -769,7 +781,7 @@ void ActNpc130(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Puppy (sleeping) // Puppy (sleeping)
void ActNpc131(NPCHAR *npc) void ActNpc131(NPCHAR *npc)
{ {
RECT rcLeft[1] = {144, 144, 160, 160}; RECT rcLeft[1] = {144, 144, 160, 160};
@ -787,7 +799,7 @@ void ActNpc131(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Puppy (barking) // Puppy (barking)
void ActNpc132(NPCHAR *npc) void ActNpc132(NPCHAR *npc)
{ {
RECT rcLeft[5] = { RECT rcLeft[5] = {
@ -932,7 +944,7 @@ void ActNpc132(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Jenka // Jenka
void ActNpc133(NPCHAR *npc) void ActNpc133(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -978,7 +990,7 @@ void ActNpc133(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Armadillo // Armadillo
void ActNpc134(NPCHAR *npc) void ActNpc134(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -1067,7 +1079,7 @@ void ActNpc134(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Skeleton // Skeleton
void ActNpc135(NPCHAR *npc) void ActNpc135(NPCHAR *npc)
{ {
unsigned char deg; unsigned char deg;
@ -1087,7 +1099,7 @@ void ActNpc135(NPCHAR *npc)
if (gMC.x < npc->x - 0x2C000 || gMC.x > npc->x + 0x2C000 || gMC.y < npc->y - 0x14000 || gMC.y > npc->y + 0x8000) if (gMC.x < npc->x - 0x2C000 || gMC.x > npc->x + 0x2C000 || gMC.y < npc->y - 0x14000 || gMC.y > npc->y + 0x8000)
npc->act_no = 0; npc->act_no = 0;
switch ( npc->act_no ) switch (npc->act_no)
{ {
case 0: case 0:
npc->act_no = 1; npc->act_no = 1;
@ -1180,7 +1192,7 @@ void ActNpc135(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Puppy (carried) // Puppy (carried)
void ActNpc136(NPCHAR *npc) void ActNpc136(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -1243,7 +1255,7 @@ void ActNpc136(NPCHAR *npc)
++npc->rect.top; ++npc->rect.top;
} }
//Large door (frame) // Large door (frame)
void ActNpc137(NPCHAR *npc) void ActNpc137(NPCHAR *npc)
{ {
RECT rc = {96, 136, 128, 188}; RECT rc = {96, 136, 128, 188};
@ -1251,7 +1263,7 @@ void ActNpc137(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Large door (door) // Large door (door)
void ActNpc138(NPCHAR *npc) void ActNpc138(NPCHAR *npc)
{ {
RECT rcLeft = {96, 112, 112, 136}; RECT rcLeft = {96, 112, 112, 136};
@ -1305,7 +1317,7 @@ void ActNpc138(NPCHAR *npc)
} }
} }
//Doctor // Doctor
void ActNpc139(NPCHAR *npc) void ActNpc139(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {