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

Prevented initial level dialog from appearing twice

Browse source
This commit is contained in:
MysterD 2021-06-26 20:36:18 -07:00
parent 3625ad8883
commit 974d9b52cf
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/mario_actions_airborne.c
View file

@ -1820,7 +1820,9 @@ s32 act_flying(struct MarioState *m) {
if (is_anim_at_end(m)) {
if (m->actionArg == 2) {
load_level_init_text(0);
if (m == &gMarioStates[0]) {
load_level_init_text(0);
}
m->actionArg = 1;
}

12
src/game/mario_actions_cutscene.c
View file

@ -1113,7 +1113,9 @@ s32 act_emerge_from_pipe(struct MarioState *m) {
s32 act_spawn_spin_airborne(struct MarioState *m) {
// entered water, exit action
if (m->pos[1] < m->waterLevel - 100) {
load_level_init_text(0);
if (m == &gMarioStates[0]) {
load_level_init_text(0);
}
return set_water_plunge_action(m);
}
@ -1146,7 +1148,9 @@ s32 act_spawn_spin_landing(struct MarioState *m) {
stop_and_set_height_to_floor(m);
set_mario_animation(m, MARIO_ANIM_GENERAL_LAND);
if (is_anim_at_end(m)) {
load_level_init_text(0);
if (m == &gMarioStates[0]) {
load_level_init_text(0);
}
set_mario_action(m, ACT_IDLE, 0);
}
return FALSE;
@ -1383,7 +1387,9 @@ s32 act_spawn_no_spin_landing(struct MarioState *m) {
set_mario_animation(m, MARIO_ANIM_GENERAL_LAND);
stop_and_set_height_to_floor(m);
if (is_anim_at_end(m)) {
load_level_init_text(0);
if (m == &gMarioStates[0]) {
load_level_init_text(0);
}
set_mario_action(m, ACT_IDLE, 0);
}
return FALSE;

4
src/game/mario_actions_stationary.c
View file

@ -1114,7 +1114,9 @@ s32 check_common_stationary_cancels(struct MarioState *m) {
if (m->pos[1] < m->waterLevel - 100) {
if (m->action == ACT_SPAWN_SPIN_LANDING) {
load_level_init_text(0);
if (m == &gMarioStates[0]) {
load_level_init_text(0);
}
}
update_mario_sound_and_camera(m);
return set_water_plunge_action(m);