mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-10-30 08:01:01 +00:00
fix pause exiting instead of "continue, don't save"
This commit is contained in:
parent
a8bc754820
commit
3b0a12c4ac
2 changed files with 9 additions and 1 deletions
|
|
@ -1863,6 +1863,7 @@ void render_dialog_string_color(s8 linesPerBox) {
|
|||
}
|
||||
|
||||
s16 gMenuMode = -1;
|
||||
s16 gPrevMenuMode = -1;
|
||||
|
||||
u8 *gEndCutsceneStringsEn[] = {
|
||||
INGAME_TEXT_PTR(TEXT_FILE_MARIO_EXCLAMATION),
|
||||
|
|
@ -3532,6 +3533,7 @@ s16 render_menus_and_dialogs(void) {
|
|||
create_dl_ortho_matrix();
|
||||
|
||||
if (gMenuMode != -1) {
|
||||
gPrevMenuMode = gMenuMode;
|
||||
switch (gMenuMode) {
|
||||
case 0:
|
||||
mode = render_pause_courses_and_castle();
|
||||
|
|
|
|||
|
|
@ -1344,7 +1344,13 @@ s32 play_mode_paused(void) {
|
|||
gCameraMovementFlags &= ~CAM_MOVE_PAUSE_SCREEN;
|
||||
set_play_mode(PLAY_MODE_NORMAL);
|
||||
} else if (gPauseScreenMode == 2) {
|
||||
level_trigger_warp(&gMarioStates[0], WARP_OP_EXIT);
|
||||
extern s16 gPrevMenuMode;
|
||||
if (gPrevMenuMode > 1) { // Course complete screen
|
||||
raise_background_noise(1);
|
||||
gCameraMovementFlags &= ~CAM_MOVE_PAUSE_SCREEN;
|
||||
} else { // Pause menu
|
||||
level_trigger_warp(&gMarioStates[0], WARP_OP_EXIT);
|
||||
}
|
||||
set_play_mode(PLAY_MODE_NORMAL);
|
||||
} else if (gPauseScreenMode == 3) {
|
||||
// Exit level
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue