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

Defer owner->xtralife sound/animation not covered by Ring Total until Bonuses have been evaluated

Browse source 
Makes more sense for Prison Break, accomodates weird combinatorial custom gametypes
This commit is contained in:
toaster 2023-10-25 17:27:02 +01:00
parent c50edc684c
commit 9cbaaa2f11
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/k_tally.cpp
View file

@ -658,21 +658,6 @@ boolean level_tally_t::IncrementLine(void)
if (*value == dest)
{
// We've reached our destination
if (lives_check == true)
{
// This is only true if Rings alone aren't responsible for our added lives.
// Generally for Prison Break, but could be earned in custom contexts too.
livesAdded = owner->xtralife;
xtraBlink = TICRATE;
if (playSounds == true)
{
S_StopSoundByNum(sfx_cdfm73);
S_StartSound(NULL, sfx_cdfm73);
}
}
return true;
}
@ -796,7 +781,24 @@ void level_tally_t::Tick(void)
{
if (IncrementLine() == true)
{
if (playSounds)
if (grandprixinfo.gp == true // In GP
&& lines >= lineCount // Finished the bonuses
&& livesAdded < owner->xtralife // Didn't max out by other causes
)
{
// This is only true if Rings alone aren't responsible for our added lives.
// Generally for Prison Break, but could be earned in custom contexts too.
livesAdded = owner->xtralife;
xtraBlink = TICRATE;
if (playSounds == true)
{
S_StopSoundByNum(sfx_cdfm73);
S_StartSound(NULL, sfx_cdfm73);
}
}
if (playSounds == true)
{
S_StopSoundByNum(sfx_mbs5b);
S_StartSound(NULL, (lines >= lineCount) ? sfx_mbs70 : sfx_mbs5b);