etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 13:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash in cutscene_bowser_arena_end()

Browse source
This commit is contained in:
MysterD 2023-05-07 16:02:46 -07:00
parent ae76ad7c00
commit 34db74660c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/camera.c
View file

@ -8338,13 +8338,18 @@ BAD_RETURN(s32) cutscene_bowser_arena_dialog(struct Camera *c) {
* End the bowser arena cutscene. * End the bowser arena cutscene.
*/ */
BAD_RETURN(s32) cutscene_bowser_arena_end(struct Camera *c) { BAD_RETURN(s32) cutscene_bowser_arena_end(struct Camera *c) {
if (!c) { return; }
cutscene_stop_dialog(c); cutscene_stop_dialog(c);
c->cutscene = 0; c->cutscene = 0;
transition_next_state(c, 20); transition_next_state(c, 20);
sStatusFlags |= CAM_FLAG_UNUSED_CUTSCENE_ACTIVE; sStatusFlags |= CAM_FLAG_UNUSED_CUTSCENE_ACTIVE;
if (sMarioCamState) {
sModeOffsetYaw = sMarioCamState->faceAngle[1] + DEGREES(90); sModeOffsetYaw = sMarioCamState->faceAngle[1] + DEGREES(90);
}
if (gSecondCameraFocus) {
gSecondCameraFocus->oBowserUnk88 = 2; gSecondCameraFocus->oBowserUnk88 = 2;
} }
}
/** /**
* Cutscene that plays when Mario enters a bowser fight. * Cutscene that plays when Mario enters a bowser fight.