More-accurate MyChar.cpp variable arrangement

This commit is contained in:
Clownacy 2020-01-07 06:52:36 +00:00
parent 7c33b0ac5f
commit f0273ecf3f

View file

@ -19,9 +19,6 @@
MYCHAR gMC; MYCHAR gMC;
int noise_no;
unsigned int noise_freq;
void InitMyChar(void) void InitMyChar(void)
{ {
memset(&gMC, 0, sizeof(MYCHAR)); memset(&gMC, 0, sizeof(MYCHAR));
@ -253,8 +250,7 @@ void ActMyChar_Normal(BOOL bKey)
int dash2; int dash2;
int resist; int resist;
int a; int a, x;
int x;
if (gMC.cond & 2) if (gMC.cond & 2)
return; return;
@ -933,6 +929,8 @@ int GetUnitMyChar(void)
void SetMyCharDirect(unsigned char dir) void SetMyCharDirect(unsigned char dir)
{ {
int i;
if (dir == 3) if (dir == 3)
{ {
gMC.cond |= 1; gMC.cond |= 1;
@ -947,8 +945,6 @@ void SetMyCharDirect(unsigned char dir)
} }
else else
{ {
int i;
for (i = 0; i < NPC_MAX; ++i) for (i = 0; i < NPC_MAX; ++i)
if (gNPC[i].code_event == dir) if (gNPC[i].code_event == dir)
break; break;
@ -990,6 +986,9 @@ void ResetCheck(void)
gMC.cond &= ~1; gMC.cond &= ~1;
} }
int noise_no;
unsigned int noise_freq;
void SetNoise(int no, int freq) void SetNoise(int no, int freq)
{ {
noise_freq = freq; noise_freq = freq;