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

More-accurate MycHit.cpp variable arrangement

Browse source
This commit is contained in:
Clownacy 2020-01-07 06:57:03 +00:00
parent f0273ecf3f
commit 24b36ccda8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/MycHit.cpp
View file

@ -409,10 +409,12 @@ int JudgeHitMyCharVectDown(int x, int y)
void HitMyCharMap(void) void HitMyCharMap(void)
{ {
int x, y;
int i; int i;
unsigned char atrb[4];
int x = gMC.x / 0x10 / 0x200; x = gMC.x / 0x10 / 0x200;
int y = gMC.y / 0x10 / 0x200; y = gMC.y / 0x10 / 0x200;
int offx[4]; int offx[4];
int offy[4]; int offy[4];
@ -427,7 +429,6 @@ void HitMyCharMap(void)
offy[2] = 1; offy[2] = 1;
offy[3] = 1; offy[3] = 1;
unsigned char atrb[4];
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
{ {
atrb[i] = GetAttribute(x + offx[i], y + offy[i]); atrb[i] = GetAttribute(x + offx[i], y + offy[i]);
@ -666,13 +667,13 @@ unsigned char JudgeHitMyCharNPC3(NPCHAR *npc)
int JudgeHitMyCharNPC4(NPCHAR *npc) int JudgeHitMyCharNPC4(NPCHAR *npc)
{ {
// TODO: comment this // TODO: comment this
int hit = 0;
float fy1;
float fx1; float fx1;
float fx2; float fx2;
float fy1;
float fy2; float fy2;
int hit = 0;
if (npc->x > gMC.x) if (npc->x > gMC.x)
fx1 = (float)(npc->x - gMC.x); fx1 = (float)(npc->x - gMC.x);
else else
@ -768,7 +769,6 @@ int JudgeHitMyCharNPC4(NPCHAR *npc)
void HitMyCharNpChar(void) void HitMyCharNpChar(void)
{ {
int i; int i;
int hit = 0; int hit = 0;
if (!(gMC.cond & 0x80) || gMC.cond & 2) if (!(gMC.cond & 0x80) || gMC.cond & 2)
@ -859,7 +859,6 @@ void HitMyCharNpChar(void)
void HitMyCharBoss(void) void HitMyCharBoss(void)
{ {
int b; int b;
int hit = 0; int hit = 0;
if (!(gMC.cond & 0x80) || gMC.cond & 2) if (!(gMC.cond & 0x80) || gMC.cond & 2)