From b231421c8048dbf4f82fab5ef29ec0d0072988f6 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 18 Jul 2018 22:01:52 -0400 Subject: [PATCH] I'll one-up your request, toaster Just make P_EndingMusic not do anything for non-local players, since P_RestoreMusic wouldn't either. --- src/p_user.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index a46d04b7..451ef7e1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1124,6 +1124,9 @@ boolean P_EndingMusic(player_t *player) char buffer[9]; boolean looping = true; + if (!P_IsLocalPlayer(player)) // Only applies to a local player + return; + // Event - Level Finish if (splitscreen && (players[displayplayer].exiting @@ -1701,7 +1704,7 @@ void P_DoPlayerExit(player_t *player) player->exiting = 3*TICRATE; - if (P_IsLocalPlayer(player) && cv_inttime.value > 0) + if (cv_inttime.value > 0) P_EndingMusic(player); // SRB2kart 120217 @@ -1714,9 +1717,7 @@ void P_DoPlayerExit(player_t *player) else if (G_BattleGametype()) // Battle Mode exiting { player->exiting = 8*TICRATE + 1; - - if (P_IsLocalPlayer(player)) - P_EndingMusic(player); + P_EndingMusic(player); } else player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard??? @@ -7951,7 +7952,7 @@ static void P_DeathThink(player_t *player) /*if (G_RaceGametype() && (player->lives <= 0)) { // to the lose music! - if (player->deadtimer == 4*TICRATE && P_IsLocalPlayer(player)) + if (player->deadtimer == 4*TICRATE) P_EndingMusic(player); // stuff below isn't for kart // Return to level music