thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-28 04:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bubbled vanilla-camera behavior

Browse source 
Fixes #66
This commit is contained in:
MysterD 2020-09-19 10:20:46 -07:00
parent 6122c4b313
commit 285b1490f3
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/mario.c
View file

@ -399,6 +399,10 @@ void mario_set_bubbled(struct MarioState* m) {
m->statusForCamera->cameraEvent = 0; m->statusForCamera->cameraEvent = 0;
extern s16 gCutsceneTimer; extern s16 gCutsceneTimer;
gCutsceneTimer = 0; gCutsceneTimer = 0;
if (m->playerIndex == 0) {
set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
}
} }
/** /**

3
src/game/mario_actions_automatic.c
View file

@ -951,6 +951,9 @@ s32 act_bubbled(struct MarioState* m) {
m->vel[1] = 0; m->vel[1] = 0;
m->vel[2] = 0; m->vel[2] = 0;
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
if (m->playerIndex == 0) {
set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
}
return force_idle_state(m); return force_idle_state(m);
} }