From ce59b705a48682d9830c5dd3a26bcd4a9c43241e Mon Sep 17 00:00:00 2001 From: fickleheart Date: Sat, 2 Feb 2019 10:54:24 -0600 Subject: [PATCH] Play generic intermission music after netreplays Mostly because I kept cycling to other people after the top half finished and always got the lose music as a result lol --- src/g_game.c | 2 +- src/p_user.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index 78111f25..205773d7 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3581,7 +3581,7 @@ static void G_DoCompleted(void) } // play some generic music if there's no win/cool/lose music going on (for exitlevel commands) - if (G_RaceGametype() && j == splitscreen+1 && (cv_inttime.value > 0)) + if (G_RaceGametype() && ((multiplayer && demoplayback) || j == splitscreen+1) && (cv_inttime.value > 0)) S_ChangeMusicInternal("racent", true); if (automapactive) diff --git a/src/p_user.c b/src/p_user.c index d7423d80..f20c57b8 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1147,6 +1147,9 @@ boolean P_EndingMusic(player_t *player) if (!P_IsLocalPlayer(player)) // Only applies to a local player return false; + if (multiplayer && demoplayback) // Don't play this in multiplayer replays + return false; + // Event - Level Finish // Check for if this is valid or not if (splitscreen)