From 86aeff55476e1f1d36f9ad06f3e1b13993e5efcb Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 28 Dec 2024 18:25:23 +0100 Subject: [PATCH] cleanup K_DirectorIsAvailable --- src/k_director.c | 9 +++++---- src/k_director.h | 1 + src/st_stuff.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/k_director.c b/src/k_director.c index 7dca59f41..6de578f5f 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -72,15 +72,16 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale) return FixedMul(n, FixedDiv(scale, mapobjectscale)); } -static boolean K_DirectorIsAvailable(UINT8 viewnum) +boolean K_DirectorIsAvailable(UINT8 viewnum) { - return ((gamestate == GS_LEVEL) && (viewnum <= splitscreen) && (!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator)); + if ((demo.playback && demo.title) || modeattacking) + return false; + return ((gamestate == GS_LEVEL) && (viewnum <= splitscreen) && (!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator) && !camera[viewnum].freecam); } 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 && (K_DirectorIsAvailable(viewnum) || (demo.playback && (!demo.title || !modeattacking) && !camera[viewnum].freecam)) && !K_DirectorIsPlayerAlone()); + return (cv_director[viewnum].value && K_DirectorIsAvailable(viewnum) && !K_DirectorIsPlayerAlone()); } void K_InitDirector(void) diff --git a/src/k_director.h b/src/k_director.h index a5431d4f5..acc00b253 100644 --- a/src/k_director.h +++ b/src/k_director.h @@ -10,6 +10,7 @@ /// \file k_director.h /// \brief SRB2kart automatic spectator camera. +boolean K_DirectorIsAvailable(UINT8 viewnum); void K_InitDirector(void); void K_UpdateDirector(UINT8 viewnum); void K_DrawDirectorDebugger(void); diff --git a/src/st_stuff.c b/src/st_stuff.c index b9730000e..5e536d853 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -667,7 +667,7 @@ static void ST_overlayDrawer(void) if (!hu_showscores) // hide the following if TAB is held { - if (cv_showdirectorhud.value && !splitscreen && ((demo.playback && !camera[viewnum].freecam && (!demo.title || !modeattacking)) || !P_IsLocalPlayer(stplyr)) && !K_DirectorIsPlayerAlone()) + if (cv_showdirectorhud.value && !splitscreen && !P_IsLocalPlayer(stplyr) && K_DirectorIsAvailable(0) && !K_DirectorIsPlayerAlone()) { char directortext[20] = {0};