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

P_EndingMusic: Change priority

Browse source 
- In gametypes where you can exit successfully but get PF_NOCONTEST, play the _lose jingle instead of RETIRE
    - Affects Prison Break, Sealed Stars
- If you're losing, even if in first place, don't play the _first jingle
    - Affects Prison Break
This commit is contained in:
toaster 2023-05-01 18:58:18 +01:00
parent d27a2fc7ef
commit 6882ea7671
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/p_user.c
View file

@ -733,16 +733,16 @@ void P_EndingMusic(void)
continue; continue;
} }
if (checkPlayer->pflags & PF_NOCONTEST) if (checkPlayer->exiting)
{
// No Contest, use special value
;
}
else if (checkPlayer->exiting)
{ {
// Standard exit, use their position // Standard exit, use their position
pos = checkPlayer->position; pos = checkPlayer->position;
} }
else if (checkPlayer->pflags & PF_NOCONTEST)
{
// No Contest without finishing, use special value
;
}
else else
{ {
// Not finished, ignore // Not finished, ignore
@ -778,15 +778,7 @@ void P_EndingMusic(void)
} }
else else
{ {
if (bestPlayer->position == 1) if (K_IsPlayerLosing(bestPlayer) == true)
{
jingle = "_first";
}
else if (K_IsPlayerLosing(bestPlayer) == false)
{
jingle = "_win";
}
else
{ {
jingle = "_lose"; jingle = "_lose";
@ -796,6 +788,14 @@ void P_EndingMusic(void)
nointer = true; nointer = true;
} }
} }
else if (bestPlayer->position == 1)
{
jingle = "_first";
}
else if (K_IsPlayerLosing(bestPlayer) == false)
{
jingle = "_win";
}
} }
if (nointer == true) if (nointer == true)