Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Mario going invisible when both are sliding

This commit is contained in:
MysterD 2020-07-30 21:43:50 -07:00
parent 7cc01ab03d
commit af55875ed5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/mario.c
View File

@ -1941,7 +1941,7 @@ skippy:
void init_mario_from_save_file(void) { void init_mario_from_save_file(void) {
bool isMario = (gMarioState == &gMarioStates[0]); bool isMario = (gMarioState == &gMarioStates[0]);
gMarioState->unk00 = 0; gMarioState->unk00 = isMario ? 0 : 1;
gMarioState->flags = 0; gMarioState->flags = 0;
gMarioState->action = 0; gMarioState->action = 0;
int i = isMario ? 0 : 1; int i = isMario ? 0 : 1;

8
src/game/obj_behaviors.c
View File

@ -503,6 +503,14 @@ s32 is_point_within_radius_of_mario(f32 x, f32 y, f32 z, s32 dist) {
return TRUE; return TRUE;
} }
mGfxX = gLuigiObject->header.gfx.pos[0];
mGfxY = gLuigiObject->header.gfx.pos[1];
mGfxZ = gLuigiObject->header.gfx.pos[2];
if ((x - mGfxX) * (x - mGfxX) + (y - mGfxY) * (y - mGfxY) + (z - mGfxZ) * (z - mGfxZ)
< (f32)(dist * dist)) {
return TRUE;
}
return FALSE; return FALSE;
} }