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

Prevent pausing in transitions if singleplayer pause is active

This commit is contained in:
David Joslin 2023-10-27 19:54:12 -07:00
parent 15f4d252bd
commit d0825d1122
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/level_update.c
View File

@ -253,6 +253,13 @@ u16 level_control_timer(s32 timerOp) {
} }
u32 pressed_pause(void) { u32 pressed_pause(void) {
if (configSingleplayerPause && network_player_connected_count() == 1) {
// prevent softlock in singleplayer pause, by not allowing pause in transitions
if (gWarpTransition.isActive || sDelayedWarpOp != WARP_OP_NONE) {
return FALSE;
}
}
if (get_dialog_id() < 0) { if (get_dialog_id() < 0) {
return gPlayer1Controller->buttonPressed & START_BUTTON; return gPlayer1Controller->buttonPressed & START_BUTTON;
} }