Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revise this fix in mario_actions_automatic.c 

Have Mario drop off the pole if it doesn't exist instead of just returning POLE_NONE.
This commit is contained in:
Prince Frizzy 2022-02-26 05:50:45 -05:00 committed by djoslin0
parent 0fc5f0d768
commit 169cd9fa44
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/mario_actions_automatic.c
View File

@ -65,7 +65,14 @@ void play_climbing_sounds(struct MarioState *m, s32 b) {
s32 set_pole_position(struct MarioState *m, f32 offsetY) {
if (m->usedObj == NULL) { m->usedObj = cur_obj_find_nearest_pole(); }
if (m->usedObj == NULL) { return POLE_NONE; }
// This is here so if somehow a pole despawns while you are on it.
// You will just drop from it.
if (m->usedObj == NULL) {
// If Mario is no longer interacting with the pole, stop the pole holding action.
set_mario_action(m, ACT_FREEFALL, 0);
return POLE_FELL_OFF;
}
UNUSED s32 unused1;
UNUSED s32 unused2;