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

Cleaned up NpcAct280.cpp

Browse source
This commit is contained in:
Gabriel Ravier 2019-05-16 08:11:17 +02:00
parent 1e6ee2d6ba
commit f1048b21aa
No known key found for this signature in database
GPG key ID: 1E75F156884F3DCE
1 changed files with 49 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/NpcAct280.cpp
View file

@ -12,7 +12,7 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
//Sue (being teleported by Misery) // Sue (being teleported by Misery)
void ActNpc280(NPCHAR *npc) void ActNpc280(NPCHAR *npc)
{ {
RECT rcLeft[2] = { RECT rcLeft[2] = {
@ -83,7 +83,7 @@ void ActNpc280(NPCHAR *npc)
} }
} }
//Doctor (red energy form) // Doctor (red energy form)
void ActNpc281(NPCHAR *npc) void ActNpc281(NPCHAR *npc)
{ {
RECT rc = {0, 0, 0, 0}; RECT rc = {0, 0, 0, 0};
@ -125,7 +125,7 @@ void ActNpc281(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Mini Undead Core (active) // Mini Undead Core (active)
void ActNpc282(NPCHAR *npc) void ActNpc282(NPCHAR *npc)
{ {
RECT tc[3] = { RECT tc[3] = {
@ -199,7 +199,7 @@ void ActNpc282(NPCHAR *npc)
npc->rect = tc[npc->ani_no]; npc->rect = tc[npc->ani_no];
} }
//Misery (transformed) // Misery (transformed)
void ActNpc283(NPCHAR *npc) void ActNpc283(NPCHAR *npc)
{ {
RECT rcLeft[11] = { RECT rcLeft[11] = {
@ -367,7 +367,7 @@ void ActNpc283(NPCHAR *npc)
if (npc->act_wait % 6 == 1) if (npc->act_wait % 6 == 1)
{ {
if ( npc->count2 == 289 ) if (npc->count2 == 289)
{ {
x = npc->x + (Random(-0x40, 0x40) * 0x200); x = npc->x + (Random(-0x40, 0x40) * 0x200);
y = npc->y + (Random(-0x20, 0x20) * 0x200); y = npc->y + (Random(-0x20, 0x20) * 0x200);
@ -456,12 +456,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0xD8; direct = 0xD8;
break; break;
case 1: case 1:
direct = 0xEC; direct = 0xEC;
break; break;
case 2: case 2:
direct = 0x14; direct = 0x14;
break; break;
case 3: case 3:
direct = 0x28; direct = 0x28;
break; break;
@ -477,12 +480,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0x58; direct = 0x58;
break; break;
case 1: case 1:
direct = 0x6C; direct = 0x6C;
break; break;
case 2: case 2:
direct = 0x94; direct = 0x94;
break; break;
case 3: case 3:
direct = 0xA8; direct = 0xA8;
break; break;
@ -505,12 +511,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0xD8; direct = 0xD8;
break; break;
case 1: case 1:
direct = 0xEC; direct = 0xEC;
break; break;
case 2: case 2:
direct = 0x14; direct = 0x14;
break; break;
case 3: case 3:
direct = 0x28; direct = 0x28;
break; break;
@ -526,12 +535,15 @@ void ActNpc283(NPCHAR *npc)
case 0: case 0:
direct = 0x58; direct = 0x58;
break; break;
case 1: case 1:
direct = 0x6C; direct = 0x6C;
break; break;
case 2: case 2:
direct = 0x94; direct = 0x94;
break; break;
case 3: case 3:
direct = 0xA8; direct = 0xA8;
break; break;
@ -600,7 +612,7 @@ void ActNpc283(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Sue (transformed) // Sue (transformed)
void ActNpc284(NPCHAR *npc) void ActNpc284(NPCHAR *npc)
{ {
RECT rcLeft[13] = { RECT rcLeft[13] = {
@ -735,9 +747,11 @@ void ActNpc284(NPCHAR *npc)
case 3: case 3:
npc->act_no = 34; npc->act_no = 34;
break; break;
case 0: case 0:
npc->act_no = 32; npc->act_no = 32;
break; break;
case 2: case 2:
npc->act_no = 32; npc->act_no = 32;
break; break;
@ -949,7 +963,7 @@ void ActNpc284(NPCHAR *npc)
npc->rect = rcRight[npc->ani_no]; npc->rect = rcRight[npc->ani_no];
} }
//Undead Core spiral projectile // Undead Core spiral projectile
void ActNpc285(NPCHAR *npc) void ActNpc285(NPCHAR *npc)
{ {
RECT rc = {232, 104, 248, 120}; RECT rc = {232, 104, 248, 120};
@ -996,7 +1010,7 @@ void ActNpc285(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Undead Core spiral shot trail // Undead Core spiral shot trail
void ActNpc286(NPCHAR *npc) void ActNpc286(NPCHAR *npc)
{ {
RECT rc[3] = { RECT rc[3] = {
@ -1017,7 +1031,7 @@ void ActNpc286(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Orange smoke // Orange smoke
void ActNpc287(NPCHAR *npc) void ActNpc287(NPCHAR *npc)
{ {
RECT rcLeft[7] = { RECT rcLeft[7] = {
@ -1056,7 +1070,7 @@ void ActNpc287(NPCHAR *npc)
npc->rect = rcLeft[npc->ani_no]; npc->rect = rcLeft[npc->ani_no];
} }
//Undead Core exploding rock // Undead Core exploding rock
void ActNpc288(NPCHAR *npc) void ActNpc288(NPCHAR *npc)
{ {
RECT rc[5] = { RECT rc[5] = {
@ -1145,7 +1159,7 @@ void ActNpc288(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Critter (orange, Misery) // Critter (orange, Misery)
void ActNpc289(NPCHAR *npc) void ActNpc289(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -1255,7 +1269,7 @@ void ActNpc289(NPCHAR *npc)
} }
} }
//Bat (Misery) // Bat (Misery)
void ActNpc290(NPCHAR *npc) void ActNpc290(NPCHAR *npc)
{ {
RECT rcLeft[3] = { RECT rcLeft[3] = {
@ -1341,7 +1355,7 @@ void ActNpc290(NPCHAR *npc)
} }
} }
//Mini Undead Core (inactive) // Mini Undead Core (inactive)
void ActNpc291(NPCHAR *npc) void ActNpc291(NPCHAR *npc)
{ {
RECT tc[2] = { RECT tc[2] = {
@ -1366,7 +1380,7 @@ void ActNpc291(NPCHAR *npc)
npc->rect = tc[npc->ani_no]; npc->rect = tc[npc->ani_no];
} }
//Quake // Quake
void ActNpc292(NPCHAR *npc) void ActNpc292(NPCHAR *npc)
{ {
(void)npc; (void)npc;
@ -1374,7 +1388,7 @@ void ActNpc292(NPCHAR *npc)
SetQuake(10); SetQuake(10);
} }
//Undead Core giant energy shot // Undead Core giant energy shot
void ActNpc293(NPCHAR *npc) void ActNpc293(NPCHAR *npc)
{ {
RECT rect[2] = { RECT rect[2] = {
@ -1404,7 +1418,7 @@ void ActNpc293(NPCHAR *npc)
npc->rect = rect[npc->ani_no]; npc->rect = rect[npc->ani_no];
} }
//Quake + falling block generator // Quake + falling block generator
void ActNpc294(NPCHAR *npc) void ActNpc294(NPCHAR *npc)
{ {
int x; int x;
@ -1466,7 +1480,7 @@ void ActNpc294(NPCHAR *npc)
} }
} }
//Cloud // Cloud
void ActNpc295(NPCHAR *npc) void ActNpc295(NPCHAR *npc)
{ {
RECT rc[4] = { RECT rc[4] = {
@ -1488,36 +1502,43 @@ void ActNpc295(NPCHAR *npc)
npc->view.back = 0xD000; npc->view.back = 0xD000;
npc->view.front = 0xD000; npc->view.front = 0xD000;
break; break;
case 1: case 1:
npc->ym = -0x800; npc->ym = -0x800;
npc->view.back = 0x7000; npc->view.back = 0x7000;
npc->view.front = 0x7000; npc->view.front = 0x7000;
break; break;
case 2: case 2:
npc->ym = -0x400; npc->ym = -0x400;
npc->view.back = 0x4000; npc->view.back = 0x4000;
npc->view.front = 0x4000; npc->view.front = 0x4000;
break; break;
case 3: case 3:
npc->ym = -0x200; npc->ym = -0x200;
npc->view.back = 0x2800; npc->view.back = 0x2800;
npc->view.front = 0x2800; npc->view.front = 0x2800;
break; break;
case 4: case 4:
npc->xm = -0x400; npc->xm = -0x400;
npc->view.back = 0xD000; npc->view.back = 0xD000;
npc->view.front = 0xD000; npc->view.front = 0xD000;
break; break;
case 5: case 5:
npc->xm = -0x200; npc->xm = -0x200;
npc->view.back = 0x7000; npc->view.back = 0x7000;
npc->view.front = 0x7000; npc->view.front = 0x7000;
break; break;
case 6: case 6:
npc->xm = -0x100; npc->xm = -0x100;
npc->view.back = 0x4000; npc->view.back = 0x4000;
npc->view.front = 0x4000; npc->view.front = 0x4000;
break; break;
case 7: case 7:
npc->xm = -0x80; npc->xm = -0x80;
npc->view.back = 0x2800; npc->view.back = 0x2800;
@ -1540,7 +1561,7 @@ void ActNpc295(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Cloud generator // Cloud generator
void ActNpc296(NPCHAR *npc) void ActNpc296(NPCHAR *npc)
{ {
int x; int x;
@ -1560,12 +1581,15 @@ void ActNpc296(NPCHAR *npc)
case 0: case 0:
pri = 0x180; pri = 0x180;
break; break;
case 1: case 1:
pri = 0x80; pri = 0x80;
break; break;
case 2: case 2:
pri = 0x40; pri = 0x40;
break; break;
case 3: case 3:
pri = 0x00; pri = 0x00;
break; break;
@ -1582,12 +1606,15 @@ void ActNpc296(NPCHAR *npc)
case 0: case 0:
pri = 0x80; pri = 0x80;
break; break;
case 1: case 1:
pri = 0x55; pri = 0x55;
break; break;
case 2: case 2:
pri = 0x40; pri = 0x40;
break; break;
case 3: case 3:
pri = 0x00; pri = 0x00;
break; break;
@ -1600,7 +1627,7 @@ void ActNpc296(NPCHAR *npc)
} }
} }
//Sue in dragon's mouth // Sue in dragon's mouth
void ActNpc297(NPCHAR *npc) void ActNpc297(NPCHAR *npc)
{ {
RECT rc = {112, 48, 0x80, 64}; RECT rc = {112, 48, 0x80, 64};
@ -1611,7 +1638,7 @@ void ActNpc297(NPCHAR *npc)
npc->rect = rc; npc->rect = rc;
} }
//Doctor (opening) // Doctor (opening)
void ActNpc298(NPCHAR *npc) void ActNpc298(NPCHAR *npc)
{ {
RECT rc[8] = { RECT rc[8] = {
@ -1676,7 +1703,7 @@ void ActNpc298(NPCHAR *npc)
++npc->ani_no; ++npc->ani_no;
} }
if ( npc->ani_no > 5 ) if (npc->ani_no > 5)
npc->ani_no = 2; npc->ani_no = 2;
npc->x += 0x100; npc->x += 0x100;
@ -1718,7 +1745,7 @@ void ActNpc298(NPCHAR *npc)
npc->rect = rc[npc->ani_no]; npc->rect = rc[npc->ani_no];
} }
//Balrog/Misery (opening) // Balrog/Misery (opening)
void ActNpc299(NPCHAR *npc) void ActNpc299(NPCHAR *npc)
{ {
RECT rc[2] = { RECT rc[2] = {