NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Prevent SURFACE_HANGABLE crash (from ckosmic branch)

Browse Source
This commit is contained in:
kafeijao
2023-03-05 13:47:07 +00:00
parent 4842cd3ed8
commit d42bb76023
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decomp/game/mario_actions_automatic.c
+3 -4
View File
@@ -412,8 +412,7 @@ s32 act_start_hanging(struct MarioState *m) {
return set_mario_action(m, ACT_GROUND_POUND, 0);
}
//! Crash if Mario's referenced ceiling is NULL (same for other hanging actions)
if (m->ceil->type != SURFACE_HANGABLE) {
if (m->ceil == NULL || m->ceil->type != SURFACE_HANGABLE) {
return set_mario_action(m, ACT_FREEFALL, 0);
}
@@ -441,7 +440,7 @@ s32 act_hanging(struct MarioState *m) {
return set_mario_action(m, ACT_GROUND_POUND, 0);
}
if (m->ceil->type != SURFACE_HANGABLE) {
if (m->ceil == NULL || m->ceil->type != SURFACE_HANGABLE) {
return set_mario_action(m, ACT_FREEFALL, 0);
}
@@ -465,7 +464,7 @@ s32 act_hang_moving(struct MarioState *m) {
return set_mario_action(m, ACT_GROUND_POUND, 0);
}
if (m->ceil->type != SURFACE_HANGABLE) {
if (m->ceil == NULL || m->ceil->type != SURFACE_HANGABLE) {
return set_mario_action(m, ACT_FREEFALL, 0);
}