Disable pausing during score screens in marathon mode
This commit is contained in:
parent
d380405b2f
commit
8bcc71c629
|
@ -2130,7 +2130,7 @@ static void Command_Pause(void)
|
||||||
|
|
||||||
if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer)))
|
if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer)))
|
||||||
{
|
{
|
||||||
if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION))
|
if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION) || (marathonmode && gamestate == GS_INTERMISSION))
|
||||||
{
|
{
|
||||||
CONS_Printf(M_GetText("You can't pause here.\n"));
|
CONS_Printf(M_GetText("You can't pause here.\n"));
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -190,7 +190,7 @@ fixed_t P_ReturnThrustY(mobj_t *mo, angle_t angle, fixed_t move)
|
||||||
boolean P_AutoPause(void)
|
boolean P_AutoPause(void)
|
||||||
{
|
{
|
||||||
// Don't pause even on menu-up or focus-lost in netgames or record attack
|
// Don't pause even on menu-up or focus-lost in netgames or record attack
|
||||||
if (netgame || modeattacking || gamestate == GS_TITLESCREEN)
|
if (netgame || modeattacking || gamestate == GS_TITLESCREEN || (marathonmode && gamestate == GS_INTERMISSION))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return (menuactive || ( window_notinfocus && cv_pauseifunfocused.value ));
|
return (menuactive || ( window_notinfocus && cv_pauseifunfocused.value ));
|
||||||
|
|
Loading…
Reference in New Issue