diff --git a/src/g_game.c b/src/g_game.c index 7c2dc274c..88effe9d8 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1975,7 +1975,7 @@ void G_Ticker(boolean run) { Music_Play("intermission"); } - else if (musiccountdown == MUSIC_COUNTDOWN_MAX - TALLY_TIME) + else if (musiccountdown == MUSIC_COUNTDOWN_MAX - K_TallyDelay()) { P_EndingMusic(); } diff --git a/src/k_tally.cpp b/src/k_tally.cpp index ef6d0a112..3beafcfc2 100644 --- a/src/k_tally.cpp +++ b/src/k_tally.cpp @@ -525,7 +525,7 @@ void level_tally_t::Init(player_t *player) } } - delay = TALLY_TIME; // sync up with musiccountdown + delay = K_TallyDelay(); // sync up with musiccountdown if (game_over == true) { @@ -1404,3 +1404,8 @@ boolean K_PlayerTallyActive(player_t *player) { return player->tally.active; //(player->exiting || (player->pflags & PF_NOCONTEST)); } + +tic_t K_TallyDelay(void) +{ + return ((gametyperules & GTR_BUMPERS) ? 4 : 3) * TICRATE; +} diff --git a/src/k_tally.h b/src/k_tally.h index ff4870184..d763e54e2 100644 --- a/src/k_tally.h +++ b/src/k_tally.h @@ -20,8 +20,7 @@ #define TALLY_WINDOW_SIZE (2) -#define TALLY_TIME (3*TICRATE) -#define MUSIC_COUNTDOWN_MAX (TALLY_TIME + 8*TICRATE) +#define MUSIC_COUNTDOWN_MAX (K_TallyDelay() + 8*TICRATE) typedef enum { @@ -119,6 +118,7 @@ void K_InitPlayerTally(player_t *player); void K_TickPlayerTally(player_t *player); void K_DrawPlayerTally(void); boolean K_PlayerTallyActive(player_t *player); +tic_t K_TallyDelay(void); #ifdef __cplusplus } // extern "C"