thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-18 14:02:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bubba eaten action not being invisible

Browse source
This commit is contained in:
Isaac0-dev 2025-06-04 09:40:45 +10:00
parent 681ea52f4b
commit 5a9f4b10bd
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/mario_actions_cutscene.c
View file

@ -943,11 +943,9 @@ s32 act_eaten_by_bubba(struct MarioState *m) {
if (!m) { return 0; } if (!m) { return 0; }
play_character_sound_if_no_flag(m, CHAR_SOUND_DYING, MARIO_ACTION_SOUND_PLAYED); play_character_sound_if_no_flag(m, CHAR_SOUND_DYING, MARIO_ACTION_SOUND_PLAYED);
set_character_animation(m, CHAR_ANIM_A_POSE); set_character_animation(m, CHAR_ANIM_A_POSE);
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
if (m->actionTimer++ == 60) { if (m->actionTimer++ == 60) {
if (m->playerIndex != 0) { if (m->playerIndex == 0) {
// do nothing
} else {
bool allowDeath = true; bool allowDeath = true;
smlua_call_event_hooks_mario_param_ret_bool(HOOK_ON_DEATH, m, &allowDeath); smlua_call_event_hooks_mario_param_ret_bool(HOOK_ON_DEATH, m, &allowDeath);
if (!allowDeath) { return FALSE; } if (!allowDeath) { return FALSE; }
@ -3006,7 +3004,7 @@ static s32 act_end_peach_cutscene(struct MarioState *m) {
if (m->controller->buttonPressed & START_BUTTON) { if (m->controller->buttonPressed & START_BUTTON) {
lvl_skip_credits(); lvl_skip_credits();
} }
sEndCutsceneVp.vp.vscale[0] = 640; sEndCutsceneVp.vp.vscale[0] = 640;
sEndCutsceneVp.vp.vscale[1] = 360; sEndCutsceneVp.vp.vscale[1] = 360;
sEndCutsceneVp.vp.vtrans[0] = 640; sEndCutsceneVp.vp.vtrans[0] = 640;
@ -3053,7 +3051,7 @@ static s32 act_credits_cutscene(struct MarioState *m) {
stop_and_set_height_to_floor(m); stop_and_set_height_to_floor(m);
} }
} }
if (m->playerIndex == 0 && m->controller->buttonPressed & START_BUTTON) { if (m->playerIndex == 0 && m->controller->buttonPressed & START_BUTTON) {
lvl_skip_credits(); lvl_skip_credits();
} }