ref: 6e20f4cc154a4dd502029519bdb91102f4683c02
parent: 6d400cfcd41adcfd1e24dc9256b54e0494c261ab
author: Clownacy <Clownacy@users.noreply.github.com>
date: Tue Jan 7 02:10:30 EST 2020
More-accurate NpcAct000.cpp variable arrangement
--- a/src/NpcAct000.cpp
+++ b/src/NpcAct000.cpp
@@ -917,8 +917,7 @@
void ActNpc010(NPCHAR *npc)
{
unsigned char deg;
- int ym;
- int xm;
+ int xm, ym;
switch (npc->act_no)
{
@@ -1075,8 +1074,7 @@
void ActNpc012(NPCHAR *npc)
{
int i;
- int x;
- int y;
+ int x, y;
switch (npc->act_no)
{
@@ -1429,8 +1427,6 @@
// Santa's Key
void ActNpc014(NPCHAR *npc)
{
- int i;
-
RECT rect[3] = {
{192, 0, 208, 16},
{208, 0, 224, 16},
@@ -1437,6 +1433,8 @@
{224, 0, 240, 16},
};
+ int i;
+
switch (npc->act_no)
{
case 0:
@@ -1474,8 +1472,6 @@
// Chest (closed)
void ActNpc015(NPCHAR *npc)
{
- int i;
-
RECT rcLeft[3] = {
{240, 0, 256, 16},
{256, 0, 272, 16},
@@ -1482,6 +1478,8 @@
{272, 0, 288, 16},
};
+ int i;
+
switch (npc->act_no)
{
case 0:
@@ -1533,8 +1531,6 @@
// Save point
void ActNpc016(NPCHAR *npc)
{
- int i;
-
RECT rect[8] = {
{96, 16, 112, 32},
{112, 16, 128, 32},
@@ -1545,6 +1541,8 @@
{192, 16, 208, 32},
{208, 16, 224, 32},
};
+
+ int i;
switch (npc->act_no)
{