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

Fix crash in peach cutscene

Browse source
This commit is contained in:
MysterD 2022-02-14 18:30:02 -08:00
parent f73c841bfe
commit 8abae8d26b
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/camera.c
View file

@ -7382,6 +7382,10 @@ BAD_RETURN(s32) cutscene_ending_mario_land(struct Camera *c) {
* Move the camera closer to peach appearing. * Move the camera closer to peach appearing.
*/ */
BAD_RETURN(s32) cutscene_ending_peach_appear_closeup(struct Camera *c) { BAD_RETURN(s32) cutscene_ending_peach_appear_closeup(struct Camera *c) {
// hacky fix to make sure cutscene focus is valid
if (gCutsceneFocus == NULL) {
gCutsceneFocus = gMarioStates[0].marioObj;
}
vec3f_set(c->pos, 179.f, 2463.f, -1216.f); vec3f_set(c->pos, 179.f, 2463.f, -1216.f);
c->pos[1] = gCutsceneFocus->oPosY + 35.f; c->pos[1] = gCutsceneFocus->oPosY + 35.f;
vec3f_set(c->focus, gCutsceneFocus->oPosX, gCutsceneFocus->oPosY + 125.f, gCutsceneFocus->oPosZ); vec3f_set(c->focus, gCutsceneFocus->oPosX, gCutsceneFocus->oPosY + 125.f, gCutsceneFocus->oPosZ);