From 1a70892fd7ed384354a55997674326e956437d2e Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Tue, 12 Mar 2024 06:14:08 -0700 Subject: [PATCH] Tally: disallow skipping tryagain/gameover (but cover for it if we do allow it later) --- src/k_tally.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/k_tally.cpp b/src/k_tally.cpp index e78986f54..519428dcb 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -1397,6 +1397,7 @@ void K_TickPlayerTally(player_t *player) boolean fastForwardInput = !demo.playback && P_IsMachineLocalPlayer(player) && G_PlayerInputDown(G_LocalSplitscreenPartyPosition(player - players), gc_a, 0); boolean allowFastForward = player->tally.state > TALLY_ST_GOTTHRU_SLIDEIN + && player->tally.state <= TALLY_ST_DONE && player->tally.releasedFastForward // - Not allowed online so we don't have to do any // networking. @@ -1410,7 +1411,7 @@ void K_TickPlayerTally(player_t *player) { do player->tally.Tick(); - while (player->tally.state != TALLY_ST_DONE); + while (player->tally.state != TALLY_ST_DONE && player->tally.state != TALLY_ST_GAMEOVER_DONE); player->tally.delay = std::min(player->tally.delay, TICRATE); musiccountdown = 2; // gets decremented to 1 in G_Ticker to immediately trigger intermission music [blows raspberry]