From 9df9f0638b8a781afcbe1892b7c3ec599cc5d03f Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 24 Nov 2023 15:09:20 -0800 Subject: [PATCH] Fix crash in check_ledge_grab --- src/game/mario_step.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/game/mario_step.c b/src/game/mario_step.c index 8a491157..f5706103 100644 --- a/src/game/mario_step.c +++ b/src/game/mario_step.c @@ -412,6 +412,8 @@ u32 check_ledge_grab(struct MarioState *m, struct Surface *wall, Vec3f intendedP ledgePos[2] = nextPos[2] - wall->normal.z * 60.0f; ledgePos[1] = find_floor(ledgePos[0], nextPos[1] + 160.0f, ledgePos[2], &ledgeFloor); + if (!ledgeFloor) { return FALSE; } + if (gLevelValues.fixCollisionBugs && gLevelValues.fixCollisionBugsFalseLedgeGrab) { // fix false ledge grabs if (!ledgeFloor || ledgeFloor->normal.y < 0.90630779f) {