From 5bdf8698bd85bb7bee204232a5bc0d941d04e3d0 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 14 Aug 2024 14:44:22 +0200 Subject: [PATCH] completely disable director in splitscreen will eventually get to splitscreen support lul --- src/k_director.c | 7 ++++++- src/st_stuff.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/k_director.c b/src/k_director.c index a39e88292..001e553ad 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -49,7 +49,7 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale) static boolean K_DirectorIsEnabled(void) { - return cv_director.value && (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)); + return cv_director.value && (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)) && !splitscreen; } void K_InitDirector(void) @@ -188,6 +188,11 @@ static boolean K_CanSwitchDirector(void) static void K_DirectorSwitch(INT32 player, boolean force) { + if (!K_DirectorIsEnabled()) + { + return; + } + if (P_IsDisplayPlayer(&players[player])) { return; diff --git a/src/st_stuff.c b/src/st_stuff.c index df4ba7db9..afbf74b8f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -662,7 +662,7 @@ static void ST_overlayDrawer(void) // Countdown timer for Race Mode // ...moved to k_kart.c so we can take advantage of the LAPS_Y value - if (demo.playback || !P_IsLocalPlayer(stplyr)) + if ((demo.playback || !P_IsLocalPlayer(stplyr)) && !splitscreen) { char directortext[20] = {0};