Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made sure to update 'statusForCamera' whenever we soft_reset_camera()

This commit is contained in:
David Joslin 2023-11-07 02:20:42 -08:00 committed by Agent X
parent 362c31fe94
commit 27df58b4f0
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/mario.c
View File

@ -534,6 +534,7 @@ void mario_set_bubbled(struct MarioState* m) {
gCutsceneTimer = 0;
if (m->playerIndex == 0) {
if (m->statusForCamera) { m->statusForCamera->action = m->action; }
soft_reset_camera(m->area->camera);
}
}

1
src/game/mario_actions_automatic.c
View File

@ -1113,6 +1113,7 @@ s32 act_bubbled(struct MarioState* m) {
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
m->invincTimer = 30 * 3;
if (m->playerIndex == 0) {
if (m->statusForCamera) { m->statusForCamera->action = m->action; }
soft_reset_camera(m->area->camera);
}
u8 underWater = (m->pos[1] < ((f32)m->waterLevel));

1
src/game/mario_actions_cutscene.c
View File

@ -753,6 +753,7 @@ void general_star_dance_handler(struct MarioState *m, s32 isInWater) {
set_mario_action(m, isInWater ? ACT_WATER_IDLE : (m->pos[1] <= m->floorHeight ? ACT_IDLE : ACT_FREEFALL), 0);
}
if (gServerSettings.stayInLevelAfterStar) {
if (m->statusForCamera) { m->statusForCamera->action = m->action; }
soft_reset_camera(m->area->camera);
}
}