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

Did formatting for NpcAct100.cpp

Browse source 
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-05-14 09:31:34 +02:00
parent 06a7e86c63
commit 9b3b7039da
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/NpcAct100.cpp
View file

@ -12,7 +12,7 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
//Grate // Grate
void ActNpc100(NPCHAR *npc) void ActNpc100(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {
@ -34,7 +34,7 @@ void ActNpc100(NPCHAR *npc)
npc->rect = rc[1]; npc->rect = rc[1];
} }
//Malco computer screen // Malco computer screen
void ActNpc101(NPCHAR *npc) void ActNpc101(NPCHAR *npc)
{ {
RECT rect[3] = { RECT rect[3] = {
@ -55,7 +55,7 @@ void ActNpc101(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
//Malco computer wave // Malco computer wave
void ActNpc102(NPCHAR *npc) void ActNpc102(NPCHAR *npc)
{ {
RECT rect[4] = { RECT rect[4] = {
@ -83,7 +83,7 @@ void ActNpc102(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
//Mannan projectile // Mannan projectile
void ActNpc103(NPCHAR *npc) void ActNpc103(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -135,7 +135,7 @@ void ActNpc103(NPCHAR *npc)
PlaySoundObject(46, 1); PlaySoundObject(46, 1);
} }
//Frog // Frog
void ActNpc104(NPCHAR *npc) void ActNpc104(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -299,7 +299,7 @@ void ActNpc104(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//'HEY!' speech bubble (low) // "HEY!" speech bubble (low)
void ActNpc105(NPCHAR *npc) void ActNpc105(NPCHAR *npc)
{ {
RECT rect[2] = { RECT rect[2] = {
@ -316,7 +316,7 @@ void ActNpc105(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
//'HEY!' speech bubble (high) // "HEY!" speech bubble (high)
void ActNpc106(NPCHAR *npc) void ActNpc106(NPCHAR *npc)
{ {
switch (npc->act_no) switch (npc->act_no)
@ -328,7 +328,7 @@ void ActNpc106(NPCHAR *npc)
} }
} }
//Malco // Malco
void ActNpc107(NPCHAR *npc) void ActNpc107(NPCHAR *npc)
{ {
int i; int i;
@ -494,7 +494,7 @@ void ActNpc107(NPCHAR *npc)
npc->rect = rcPoweron[npc->ani_no]; npc->rect = rcPoweron[npc->ani_no];
} }
//Balfrog projectile // Balfrog projectile
void ActNpc108(NPCHAR *npc) void ActNpc108(NPCHAR *npc)
{ {
if (npc->flag & 0xFF) if (npc->flag & 0xFF)
@ -530,7 +530,7 @@ void ActNpc108(NPCHAR *npc)
} }
} }
//Malco (broken) // Malco (broken)
void ActNpc109(NPCHAR *npc) void ActNpc109(NPCHAR *npc)
{ {
int i; int i;
@ -603,7 +603,7 @@ void ActNpc109(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Puchi // Puchi
void ActNpc110(NPCHAR *npc) void ActNpc110(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -766,7 +766,7 @@ void ActNpc110(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Quote (teleport out) // Quote (teleport out)
void ActNpc111(NPCHAR *npc) void ActNpc111(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -854,7 +854,7 @@ void ActNpc111(NPCHAR *npc)
} }
} }
//Quote (teleport in) // Quote (teleport in)
void ActNpc112(NPCHAR *npc) void ActNpc112(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -925,12 +925,12 @@ void ActNpc112(NPCHAR *npc)
{ {
npc->rect.bottom = npc->rect.top + npc->act_wait / 4; npc->rect.bottom = npc->rect.top + npc->act_wait / 4;
if ( npc->act_wait / 2 % 2 ) if (npc->act_wait / 2 % 2)
++npc->rect.left; ++npc->rect.left;
} }
} }
//Professor Booster // Professor Booster
void ActNpc113(NPCHAR *npc) void ActNpc113(NPCHAR *npc)
{ {
RECT rcLeft[7] = { RECT rcLeft[7] = {
@ -1061,7 +1061,7 @@ void ActNpc113(NPCHAR *npc)
} }
} }
//Press // Press
void ActNpc114(NPCHAR *npc) void ActNpc114(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -1085,6 +1085,7 @@ void ActNpc114(NPCHAR *npc)
npc->ani_no = 1; npc->ani_no = 1;
break; break;
case 10: case 10:
if (++npc->ani_wait > 2) if (++npc->ani_wait > 2)
{ {
@ -1135,7 +1136,7 @@ void ActNpc114(NPCHAR *npc)
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
} }
//Ravil // Ravil
void ActNpc115(NPCHAR *npc) void ActNpc115(NPCHAR *npc)
{ {
int i; int i;
@ -1294,7 +1295,7 @@ void ActNpc115(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Red petals // Red petals
void ActNpc116(NPCHAR *npc) void ActNpc116(NPCHAR *npc)
{ {
RECT rc = {272, 184, 320, 200}; RECT rc = {272, 184, 320, 200};
@ -1302,7 +1303,7 @@ void ActNpc116(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Curly // Curly
void ActNpc117(NPCHAR *npc) void ActNpc117(NPCHAR *npc)
{ {
RECT rcLeft[10] = { RECT rcLeft[10] = {
@ -1507,7 +1508,7 @@ void ActNpc117(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Curly (boss) // Curly (boss)
void ActNpc118(NPCHAR *npc) void ActNpc118(NPCHAR *npc)
{ {
RECT rcLeft[9] = { RECT rcLeft[9] = {
@ -1538,7 +1539,7 @@ void ActNpc118(NPCHAR *npc)
if (npc->direct == 0 && npc->x < gMC.x) if (npc->direct == 0 && npc->x < gMC.x)
bUpper = TRUE; bUpper = TRUE;
if ( npc->direct == 2 && npc->x > gMC.x) if (npc->direct == 2 && npc->x > gMC.x)
bUpper = TRUE; bUpper = TRUE;
switch (npc->act_no) switch (npc->act_no)
@ -1708,7 +1709,7 @@ void ActNpc118(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Table and chair // Table and chair
void ActNpc119(NPCHAR *npc) void ActNpc119(NPCHAR *npc)
{ {
RECT rc = {248, 184, 272, 200}; RECT rc = {248, 184, 272, 200};