From d2b0fc3b5e54582a8efc92eefbd36e115b45b0ed Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 28 Dec 2024 18:17:34 +0100 Subject: [PATCH] add K_DirectorIsAvailable --- src/k_director.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/k_director.c b/src/k_director.c index f3dd3733c..7dca59f41 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -72,10 +72,15 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale) return FixedMul(n, FixedDiv(scale, mapobjectscale)); } +static boolean K_DirectorIsAvailable(UINT8 viewnum) +{ + return ((gamestate == GS_LEVEL) && (viewnum <= splitscreen) && (!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator)); +} + static boolean K_DirectorIsEnabled(const UINT8 viewnum) { //return cv_director.value && !splitscreen && (gamestate == GS_LEVEL && (((!playeringame[consoleplayer] || players[consoleplayer].spectator)) || (demo.playback && !camera[0].freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone()); - return (cv_director[viewnum].value && (gamestate == GS_LEVEL && (((!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator)) || (demo.playback && !camera[viewnum].freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone())); + return (cv_director[viewnum].value && (K_DirectorIsAvailable(viewnum) || (demo.playback && (!demo.title || !modeattacking) && !camera[viewnum].freecam)) && !K_DirectorIsPlayerAlone()); } void K_InitDirector(void) @@ -435,7 +440,7 @@ void K_ToggleDirector(const UINT8 viewnum) //if (!directortextactive) //return; - if (gamestate != GS_LEVEL && (playeringame[displayplayers[viewnum]] || !players[displayplayers[viewnum]].spectator)) + if (K_DirectorIsAvailable(viewnum)) return; if (!K_DirectorIsEnabled(viewnum))