lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow countdown time-up in any campaign gametype

This commit is contained in:
Jaime Passos 2020-02-23 16:50:36 -03:00
parent 290cd9d08e
commit 7439ab5296
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_game.c
View File

@ -2899,7 +2899,7 @@ void G_DoReborn(INT32 playernum)
return; return;
} }
if (countdowntimeup || (!(netgame || multiplayer) && gametype == GT_COOP)) if (countdowntimeup || (!(netgame || multiplayer) && (gametyperules & GTR_CAMPAIGN)))
resetlevel = true; resetlevel = true;
else if ((G_GametypeUsesCoopLives() || G_GametypeUsesCoopStarposts()) && (netgame || multiplayer) && !G_IsSpecialStage(gamemap)) else if ((G_GametypeUsesCoopLives() || G_GametypeUsesCoopStarposts()) && (netgame || multiplayer) && !G_IsSpecialStage(gamemap))
{ {

2
src/p_tick.c
View File

@ -698,7 +698,7 @@ void P_Ticker(boolean run)
if (run) if (run)
{ {
if (countdowntimer && G_PlatformGametype() && (gametype == GT_COOP || leveltime >= 4*TICRATE) && !stoppedclock && --countdowntimer <= 0) if (countdowntimer && G_PlatformGametype() && ((gametyperules & GTR_CAMPAIGN) || leveltime >= 4*TICRATE) && !stoppedclock && --countdowntimer <= 0)
{ {
countdowntimer = 0; countdowntimer = 0;
countdowntimeup = true; countdowntimeup = true;