From 913610b1b7bdc425c4079ec9dfe9d35c479f8076 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 11 Feb 2022 10:38:16 +0000 Subject: [PATCH] Fixed P_RestoreMusic using displayplayers instead of local players (did not use any of the functions directly and so was missed). --- src/p_user.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/p_user.c b/src/p_user.c index d78cfe84b..30ad2b8d4 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -813,6 +813,7 @@ void P_RestoreMusic(player_t *player) if (r_splitscreen) { INT32 bestlocaltimer = 1; + INT32 *localplayertable = (splitscreen_partied[consoleplayer] ? splitscreen_party[consoleplayer] : g_localplayers); #define setbests(p) \ if (players[p].playerstate == PST_LIVE) \ @@ -822,12 +823,12 @@ void P_RestoreMusic(player_t *player) else if (players[p].growshrinktimer > bestlocaltimer) \ { wantedmus = 2; bestlocaltimer = players[p].growshrinktimer; } \ } - setbests(displayplayers[0]); - setbests(displayplayers[1]); + setbests(localplayertable[0]); + setbests(localplayertable[1]); if (r_splitscreen > 1) - setbests(displayplayers[2]); + setbests(localplayertable[2]); if (r_splitscreen > 2) - setbests(displayplayers[3]); + setbests(localplayertable[3]); #undef setbests } else