mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
Prevent pausing in transitions if singleplayer pause is active
This commit is contained in:
parent
15f4d252bd
commit
d0825d1122
1 changed files with 7 additions and 0 deletions
|
@ -253,6 +253,13 @@ u16 level_control_timer(s32 timerOp) {
|
|||
}
|
||||
|
||||
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) {
|
||||
return gPlayer1Controller->buttonPressed & START_BUTTON;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue