cleanup K_DirectorIsAvailable

This commit is contained in:
Alug committed 2024-12-28 18:25:23 +01:00
1 parent b5b2062efa
commit 86aeff5547
3 files changed
+7 -5

No files matched your search

+5 -4
View File
@@ -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)
+1
View File
@@ -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);
+1 -1
View File
@@ -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};