thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Battle: delay Tally a little bit to let round end camera finish beforehand

Browse source
This commit is contained in:
James R 2024-01-20 21:51:06 -08:00
parent a012b90c89
commit 418f2a14c4
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -1975,7 +1975,7 @@ void G_Ticker(boolean run)
{ {
Music_Play("intermission"); Music_Play("intermission");
} }
else if (musiccountdown == MUSIC_COUNTDOWN_MAX - TALLY_TIME) else if (musiccountdown == MUSIC_COUNTDOWN_MAX - K_TallyDelay())
{ {
P_EndingMusic(); P_EndingMusic();
} }

7
src/k_tally.cpp
View file

@ -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) if (game_over == true)
{ {
@ -1404,3 +1404,8 @@ boolean K_PlayerTallyActive(player_t *player)
{ {
return player->tally.active; //(player->exiting || (player->pflags & PF_NOCONTEST)); return player->tally.active; //(player->exiting || (player->pflags & PF_NOCONTEST));
} }
tic_t K_TallyDelay(void)
{
return ((gametyperules & GTR_BUMPERS) ? 4 : 3) * TICRATE;
}

4
src/k_tally.h
View file

@ -20,8 +20,7 @@
#define TALLY_WINDOW_SIZE (2) #define TALLY_WINDOW_SIZE (2)
#define TALLY_TIME (3*TICRATE) #define MUSIC_COUNTDOWN_MAX (K_TallyDelay() + 8*TICRATE)
#define MUSIC_COUNTDOWN_MAX (TALLY_TIME + 8*TICRATE)
typedef enum typedef enum
{ {
@ -119,6 +118,7 @@ void K_InitPlayerTally(player_t *player);
void K_TickPlayerTally(player_t *player); void K_TickPlayerTally(player_t *player);
void K_DrawPlayerTally(void); void K_DrawPlayerTally(void);
boolean K_PlayerTallyActive(player_t *player); boolean K_PlayerTallyActive(player_t *player);
tic_t K_TallyDelay(void);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"