From b41086a0941f8c3c8b8270205c8187ea2fcee257 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 22 Sep 2020 13:53:18 +0100 Subject: [PATCH] Fix UI timers being borked at map start --- src/p_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index 6ef7d653a..ef9713808 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2617,7 +2617,7 @@ static void P_DeathThink(player_t *player) } // Keep time rolling - if (!(exitcountdown && !racecountdown) && !(player->exiting || mapreset) && !(player->pflags & PF_GAMETYPEOVER)) + if (!(exitcountdown && !racecountdown) && !(player->exiting || mapreset) && !(player->pflags & PF_GAMETYPEOVER) && !stoppedclock) { if (leveltime >= starttime) { @@ -4366,9 +4366,9 @@ void P_PlayerThink(player_t *player) } // Synchronizes the "real" amount of time spent in the level. - if (!player->exiting && !stoppedclock) + if (!(exitcountdown && !racecountdown) && !(player->exiting || mapreset) && !(player->pflags & PF_GAMETYPEOVER) && !stoppedclock) { - if (gametyperules & GTR_CIRCUIT) + if (leveltime >= starttime) { player->realtime = leveltime - starttime; if (player == &players[consoleplayer])