From 36f8ce8f78b4fc2ed883814f4b106904242dda50 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 13 Sep 2022 20:32:43 +0100 Subject: [PATCH] Slightly refactor M_StartControlPanel In anticipation of attempt to incorporate into CL_ABORT process --- src/k_menufunc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/k_menufunc.c b/src/k_menufunc.c index 65047c372..8adb24070 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -925,11 +925,6 @@ void M_StartControlPanel(void) menucmd[i].delay = MENUDELAYTIME; } - // No instantly skipping the titlescreen. - // (We can change this timer later when extra animation is added.) - if (gamestate == GS_TITLESCREEN && finalecount < 1) - return; - // intro might call this repeatedly if (menuactive) { @@ -939,6 +934,11 @@ void M_StartControlPanel(void) if (gamestate == GS_TITLESCREEN) // Set up menu state { + // No instantly skipping the titlescreen. + // (We can change this timer later when extra animation is added.) + if (finalecount < 1) + return; + G_SetGamestate(GS_MENU); gameaction = ga_nothing;