From ce721f9f782b052ad474d2e4e1a3c8363df8869e Mon Sep 17 00:00:00 2001 From: spherallic Date: Sun, 20 Aug 2023 23:40:13 +0200 Subject: [PATCH 1/2] Allow input during title animation after 1st play --- src/g_game.c | 2 +- src/m_menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 6b4890a1c..fce9919f1 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2080,7 +2080,7 @@ boolean G_Responder(event_t *ev) if (gameaction == ga_nothing && !singledemo && ((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN)) { - if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE)) + if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value)) { M_StartControlPanel(); return true; diff --git a/src/m_menu.c b/src/m_menu.c index c49442141..81ff0f679 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3196,7 +3196,7 @@ boolean M_Responder(event_t *ev) || gamestate == GS_CREDITS || gamestate == GS_EVALUATION || gamestate == GS_GAMEEND) return false; - if (gamestate == GS_TITLESCREEN && finalecount < TICRATE) + if (gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value) return false; if (CON_Ready() && gamestate != GS_WAITINGPLAYERS) From 85fc55bfc1b0f14f22a966e7a83bce00acf2ba0b Mon Sep 17 00:00:00 2001 From: spherallic Date: Tue, 5 Sep 2023 19:38:45 +0200 Subject: [PATCH 2/2] Prevent title input during negative finalecount --- src/g_game.c | 2 +- src/m_menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index fce9919f1..4140a91eb 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2080,7 +2080,7 @@ boolean G_Responder(event_t *ev) if (gameaction == ga_nothing && !singledemo && ((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN)) { - if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value)) + if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < (cv_tutorialprompt.value ? TICRATE : 0))) { M_StartControlPanel(); return true; diff --git a/src/m_menu.c b/src/m_menu.c index 81ff0f679..f7b65910d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3196,7 +3196,7 @@ boolean M_Responder(event_t *ev) || gamestate == GS_CREDITS || gamestate == GS_EVALUATION || gamestate == GS_GAMEEND) return false; - if (gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value) + if (gamestate == GS_TITLESCREEN && finalecount < (cv_tutorialprompt.value ? TICRATE : 0)) return false; if (CON_Ready() && gamestate != GS_WAITINGPLAYERS)