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

Add backwards compatibility for cur_obj_is_mario_ground_pounding_platform()

This commit is contained in:
MysterD 2023-05-16 00:37:30 -07:00
parent 3a93423fcc
commit 6386f1f9c2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/level_script.c
View File

@ -373,6 +373,11 @@ static void level_reset_globals(void) {
gEnvFxBuffer = NULL; gEnvFxBuffer = NULL;
gEnvFxMode = ENVFX_MODE_NONE; gEnvFxMode = ENVFX_MODE_NONE;
// clear area's level pool pointers
for (int i = 0; i < 8; i++) {
gAreas[i].unk04 = NULL;
}
// free models stored in dynos // free models stored in dynos
dynos_model_clear_pool(MODEL_POOL_LEVEL); dynos_model_clear_pool(MODEL_POOL_LEVEL);
} }

2
src/game/object_helpers.c
View File

@ -2627,7 +2627,7 @@ s32 cur_obj_is_mario_ground_pounding_platform(void) {
if (!is_player_active(&gMarioStates[i])) { continue; } if (!is_player_active(&gMarioStates[i])) { continue; }
if (!gMarioStates[i].marioObj) { continue; } if (!gMarioStates[i].marioObj) { continue; }
if (gMarioStates[i].marioObj->platform == o) { if (gMarioStates[i].marioObj->platform == o) {
if (determine_interaction(&gMarioStates[i], o) & INT_GROUND_POUND) { if ((determine_interaction(&gMarioStates[i], o) & INT_GROUND_POUND) || (gMarioStates[i].action == ACT_GROUND_POUND_LAND)) {
return TRUE; return TRUE;
} }
} }