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

Add VSENT jingle to successful Versus conclusion

Browse source
This commit is contained in:
toaster 2024-03-07 23:48:11 +00:00
parent 8180033ae1
commit 6f0710818f
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/p_user.c
View file

@ -598,13 +598,15 @@ void P_EndingMusic(void)
UINT8 bestPos = UINT8_MAX; UINT8 bestPos = UINT8_MAX;
player_t *bestPlayer = NULL; player_t *bestPlayer = NULL;
SINT8 i; SINT8 i = MAXPLAYERS;
// See G_DoCompleted and Y_DetermineIntermissionType // See G_DoCompleted and Y_DetermineIntermissionType
boolean nointer = ((modeattacking && (players[consoleplayer].pflags & PF_NOCONTEST)) boolean nointer = ((modeattacking && (players[consoleplayer].pflags & PF_NOCONTEST))
|| (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)); || (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE));
for (i = 0; i < MAXPLAYERS; i++) if (K_CheckBossIntro())
;
else for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] if (!playeringame[i]
|| players[i].spectator) || players[i].spectator)
@ -691,34 +693,37 @@ void P_EndingMusic(void)
nointer = true; nointer = true;
} }
} }
else if (K_IsPlayerLosing(bestPlayer) == true)
{
jingle = "_lose";
if (G_GametypeUsesLives() == true)
{
// A retry will be happening
nointer = true;
}
}
else else
{ {
if (K_IsPlayerLosing(bestPlayer) == true) if (K_CheckBossIntro() == true)
{ {
jingle = "_lose"; jingle = "VSENT";
if (G_GametypeUsesLives() == true)
{
// A retry will be happening
nointer = true;
}
} }
else if (bestPlayer->position == 1) else if (modeattacking)
{
jingle = "_first";
}
else if (K_IsPlayerLosing(bestPlayer) == false)
{
jingle = "_win";
}
if (modeattacking && !K_IsPlayerLosing(bestPlayer))
{ {
if (players[consoleplayer].realtime < oldbest && oldbest != (tic_t)UINT32_MAX) if (players[consoleplayer].realtime < oldbest && oldbest != (tic_t)UINT32_MAX)
jingle = "newrec"; jingle = "newrec";
else else
jingle = "norec"; jingle = "norec";
} }
else if (bestPlayer->position == 1)
{
jingle = "_first";
}
else
{
jingle = "_win";
}
} }
skippingposition: skippingposition: