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

Fixed crash in warp_credits

This commit is contained in:
MysterD 2023-11-08 12:18:24 -08:00
parent 03d6958a30
commit 21583cff0b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/level_update.c
View File

@ -618,7 +618,9 @@ void warp_credits(void) {
set_mario_action(gMarioState, marioAction, 0); set_mario_action(gMarioState, marioAction, 0);
reset_camera(gCurrentArea->camera); if (gCurrentArea) {
reset_camera(gCurrentArea->camera);
}
sWarpDest.type = WARP_TYPE_NOT_WARPING; sWarpDest.type = WARP_TYPE_NOT_WARPING;
sDelayedWarpOp = WARP_OP_NONE; sDelayedWarpOp = WARP_OP_NONE;
@ -626,7 +628,9 @@ void warp_credits(void) {
play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x14, 0x00, 0x00, 0x00); play_transition(WARP_TRANSITION_FADE_FROM_COLOR, 0x14, 0x00, 0x00, 0x00);
if (gCurrCreditsEntry == NULL || gCurrCreditsEntry == sCreditsSequence) { if (gCurrCreditsEntry == NULL || gCurrCreditsEntry == sCreditsSequence) {
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0); if (gCurrentArea) {
set_background_music(gCurrentArea->musicParam, gCurrentArea->musicParam2, 0);
}
} }
} }