diff --git a/src/g_game.c b/src/g_game.c index a3305157e..88decbd40 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -50,6 +50,7 @@ #include "b_bot.h" #include "m_cond.h" // condition sets #include "md5.h" // demo checksums +#include "k_director.h" // SRB2kart #include "k_kart.h" // SRB2kart #include "r_fps.h" // frame interpolation/uncapped @@ -1940,7 +1941,7 @@ boolean G_Responder(event_t *ev) if (ev->data1 == gamecontrol[gc_director][0] || ev->data1 == gamecontrol[gc_director][1]) { - COM_ImmedExecute("add director 1"); + K_ToggleDirector(); } return true; diff --git a/src/k_director.c b/src/k_director.c index a1c9f57c1..01b2ff001 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -25,6 +25,11 @@ static fixed_t P_ScaleFromMap(fixed_t n, fixed_t scale) return FixedMul(n, FixedDiv(scale, mapobjectscale)); } +static boolean K_DirectorIsEnabled(void) +{ + return cv_director.value && (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)); +} + void K_InitDirector(void) { INT32 playernum; @@ -215,6 +220,11 @@ static void K_DirectorForceSwitch(INT32 player, INT32 time) void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) { + if (!K_DirectorIsEnabled()) + { + return; + } + if (!P_IsDisplayPlayer(player)) { return; @@ -287,7 +297,7 @@ void K_UpdateDirector(void) INT32 *displayplayerp = &displayplayers[0]; INT32 targetposition; - if (!cv_director.value) + if (!K_DirectorIsEnabled()) { return; } @@ -368,3 +378,13 @@ void K_UpdateDirector(void) break; } } + +void K_ToggleDirector(void) +{ + if (!K_DirectorIsEnabled()) + { + directorinfo.cooldown = 0; // switch immediately + } + + COM_ImmedExecute("add director 1"); +} diff --git a/src/k_director.h b/src/k_director.h index db19fbe8b..8842c7b8e 100644 --- a/src/k_director.h +++ b/src/k_director.h @@ -18,4 +18,5 @@ extern struct directorinfo void K_InitDirector(void); void K_UpdateDirector(void); void K_DrawDirectorDebugger(void); -void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); \ No newline at end of file +void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); +void K_ToggleDirector(void); diff --git a/src/p_tick.c b/src/p_tick.c index 63d302422..4a345e141 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -830,8 +830,7 @@ void P_Ticker(boolean run) PS_STOP_TIMING(ps_lua_postthinkframe_time); } - if (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback)) - K_UpdateDirector(); + K_UpdateDirector(); // Always move the camera. for (i = 0; i <= splitscreen; i++)