From 9440aa62ffa078a25c2fe00fa49e5aa2d64d41c3 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 24 Sep 2024 16:57:20 +0200 Subject: [PATCH] only allow director toggling with button when you spec someone --- src/g_game.c | 1 - src/k_director.c | 5 +++++ src/st_stuff.c | 7 +++++++ src/st_stuff.h | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/g_game.c b/src/g_game.c index 13d435f22..2258a6fba 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1857,7 +1857,6 @@ boolean G_Responder(event_t *ev) || ev->data1 == gamecontrol[gc_director][1]) { K_ToggleDirector(); - directortoggletimer = 0; } return true; diff --git a/src/k_director.c b/src/k_director.c index 3789afa75..51406cf07 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -395,10 +395,15 @@ void K_UpdateDirector(void) void K_ToggleDirector(void) { + if (!directortextactive) + return; + if (!K_DirectorIsEnabled()) { directorinfo.cooldown = 0; // switch immediately } + directortoggletimer = 0; + COM_ImmedExecute("add director 1"); } diff --git a/src/st_stuff.c b/src/st_stuff.c index 55cf773da..e35b811e2 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -155,6 +155,8 @@ static patch_t *envelope; player_t *stplyr; UINT8 stplyrnum; +boolean directortextactive = false; + // SRB2kart hudinfo_t hudinfo[NUMHUDITEMS] = @@ -661,6 +663,8 @@ static void ST_overlayDrawer(void) snprintf(directortext, 20, "Director: %s", cv_director.value ? "On" : "Off"); + directortextactive = true; + if ((!demo.playback && directortoggletimer < 13*TICRATE) || (demo.playback && directortoggletimer < 4*TICRATE)) { if (renderisnewtic) @@ -673,7 +677,10 @@ static void ST_overlayDrawer(void) } } else + { directortoggletimer = 0; + directortextactive = false; + } if (cv_showviewpointtext.value) { diff --git a/src/st_stuff.h b/src/st_stuff.h index 250db1e7f..308dae2a0 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -146,4 +146,6 @@ extern UINT16 objectsdrawn; extern consvar_t cv_lessflicker; extern consvar_t cv_stagetitle; +extern boolean directortextactive; + #endif