vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

I'll one-up your request, toaster

Browse source 
Just make P_EndingMusic not do anything for non-local players, since P_RestoreMusic wouldn't either.
This commit is contained in:
TehRealSalt 2018-07-18 22:01:52 -04:00
parent 7e0d5a479c
commit b231421c80
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_user.c
View file

@ -1124,6 +1124,9 @@ boolean P_EndingMusic(player_t *player)
char buffer[9]; char buffer[9];
boolean looping = true; boolean looping = true;
if (!P_IsLocalPlayer(player)) // Only applies to a local player
return;
// Event - Level Finish // Event - Level Finish
if (splitscreen if (splitscreen
&& (players[displayplayer].exiting && (players[displayplayer].exiting
@ -1701,7 +1704,7 @@ void P_DoPlayerExit(player_t *player)
player->exiting = 3*TICRATE; player->exiting = 3*TICRATE;
if (P_IsLocalPlayer(player) && cv_inttime.value > 0) if (cv_inttime.value > 0)
P_EndingMusic(player); P_EndingMusic(player);
// SRB2kart 120217 // SRB2kart 120217
@ -1714,8 +1717,6 @@ void P_DoPlayerExit(player_t *player)
else if (G_BattleGametype()) // Battle Mode exiting else if (G_BattleGametype()) // Battle Mode exiting
{ {
player->exiting = 8*TICRATE + 1; player->exiting = 8*TICRATE + 1;
if (P_IsLocalPlayer(player))
P_EndingMusic(player); P_EndingMusic(player);
} }
else else
@ -7951,7 +7952,7 @@ static void P_DeathThink(player_t *player)
/*if (G_RaceGametype() && (player->lives <= 0)) /*if (G_RaceGametype() && (player->lives <= 0))
{ {
// to the lose music! // to the lose music!
if (player->deadtimer == 4*TICRATE && P_IsLocalPlayer(player)) if (player->deadtimer == 4*TICRATE)
P_EndingMusic(player); P_EndingMusic(player);
// stuff below isn't for kart // stuff below isn't for kart
// Return to level music // Return to level music