More-accurate NpcAct000.cpp variable arrangement

This commit is contained in:
Clownacy 2020-01-07 07:10:30 +00:00
parent 6d400cfcd4
commit 6e20f4cc15

View file

@ -917,8 +917,7 @@ void ActNpc009(NPCHAR *npc)
void ActNpc010(NPCHAR *npc) void ActNpc010(NPCHAR *npc)
{ {
unsigned char deg; unsigned char deg;
int ym; int xm, ym;
int xm;
switch (npc->act_no) switch (npc->act_no)
{ {
@ -1075,8 +1074,7 @@ void ActNpc011(NPCHAR *npc)
void ActNpc012(NPCHAR *npc) void ActNpc012(NPCHAR *npc)
{ {
int i; int i;
int x; int x, y;
int y;
switch (npc->act_no) switch (npc->act_no)
{ {
@ -1429,14 +1427,14 @@ void ActNpc013(NPCHAR *npc)
// Santa's Key // Santa's Key
void ActNpc014(NPCHAR *npc) void ActNpc014(NPCHAR *npc)
{ {
int i;
RECT rect[3] = { RECT rect[3] = {
{192, 0, 208, 16}, {192, 0, 208, 16},
{208, 0, 224, 16}, {208, 0, 224, 16},
{224, 0, 240, 16}, {224, 0, 240, 16},
}; };
int i;
switch (npc->act_no) switch (npc->act_no)
{ {
case 0: case 0:
@ -1474,14 +1472,14 @@ void ActNpc014(NPCHAR *npc)
// Chest (closed) // Chest (closed)
void ActNpc015(NPCHAR *npc) void ActNpc015(NPCHAR *npc)
{ {
int i;
RECT rcLeft[3] = { RECT rcLeft[3] = {
{240, 0, 256, 16}, {240, 0, 256, 16},
{256, 0, 272, 16}, {256, 0, 272, 16},
{272, 0, 288, 16}, {272, 0, 288, 16},
}; };
int i;
switch (npc->act_no) switch (npc->act_no)
{ {
case 0: case 0:
@ -1533,8 +1531,6 @@ void ActNpc015(NPCHAR *npc)
// Save point // Save point
void ActNpc016(NPCHAR *npc) void ActNpc016(NPCHAR *npc)
{ {
int i;
RECT rect[8] = { RECT rect[8] = {
{96, 16, 112, 32}, {96, 16, 112, 32},
{112, 16, 128, 32}, {112, 16, 128, 32},
@ -1546,6 +1542,8 @@ void ActNpc016(NPCHAR *npc)
{208, 16, 224, 32}, {208, 16, 224, 32},
}; };
int i;
switch (npc->act_no) switch (npc->act_no)
{ {
case 0: case 0: