thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tally-ff-intermission-music' into 'master'

Browse source 
Tally: Fix intermission music being played on rounds without intermissions

Closes #1178

See merge request KartKrew/Kart!2134
This commit is contained in:
AJ Martinez 2024-03-19 03:50:58 +00:00
commit d7030fd912
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_tally.cpp
View file

@ -1426,6 +1426,8 @@ void K_TickPlayerTally(player_t *player)
while (player->tally.state != TALLY_ST_DONE && player->tally.state != TALLY_ST_GAMEOVER_DONE);
player->tally.delay = std::min(player->tally.delay, TICRATE);
if (Y_ShouldDoIntermission())
musiccountdown = 2; // gets decremented to 1 in G_Ticker to immediately trigger intermission music [blows raspberry]
}
else

22
src/y_inter.cpp
View file

@ -1937,12 +1937,7 @@ void Y_Ticker(void)
}
}
//
// Y_DetermineIntermissionType
//
// Determines the intermission type from the current gametype.
//
void Y_DetermineIntermissionType(void)
boolean Y_ShouldDoIntermission(void)
{
// no intermission for GP events
if ((grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
@ -1954,6 +1949,21 @@ void Y_DetermineIntermissionType(void)
|| (nextmapoverride == NEXTMAP_TUTORIALCHALLENGE+1 || tutorialchallenge != TUTORIALSKIP_NONE)
// or title screen attract demos
|| (demo.playback && demo.attract == DEMO_ATTRACT_TITLE))
{
return false;
}
return true;
}
//
// Y_DetermineIntermissionType
//
// Determines the intermission type from the current gametype.
//
void Y_DetermineIntermissionType(void)
{
// no intermission for GP events
if (!Y_ShouldDoIntermission())
{
intertype = int_none;
return;

1
src/y_inter.h
View file

@ -59,6 +59,7 @@ void Y_DrawIntermissionButton(INT32 startslide, INT32 through);
void Y_StartIntermission(void);
void Y_EndIntermission(void);
boolean Y_ShouldDoIntermission(void);
void Y_DetermineIntermissionType(void);
void Y_PlayIntermissionMusic(void);