From ccff9a6ce2cefd967348a502dc1d8b6df98824a6 Mon Sep 17 00:00:00 2001 From: SteelT Date: Tue, 20 Sep 2022 15:04:37 -0400 Subject: [PATCH] Improve profile applying during startup This allow cases can route around the title screen, such as if the `-connect` command line param is used, to work properly --- src/d_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index d7092a901..d6dcfbcab 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1775,16 +1775,16 @@ void D_SRB2Main(void) } } + // Has to be done before anything else so skin, color, etc in command buffer has an affect. + // ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action + PR_ApplyProfile(cv_ttlprofilen.value, 0); + if (autostart || netgame) { gameaction = ga_nothing; CV_ClearChangedFlags(); - // Has to be done before anything else so skin, color, etc in command buffer has an affect. - // ttlprofilen used because it's roughly equivalent in functionality - a QoL aid for quickly getting from startup to action - PR_ApplyProfile(cv_ttlprofilen.value, 0); - // Do this here so if you run SRB2 with eg +timelimit 5, the time limit counts // as having been modified for the first game. M_PushSpecialParameters(); // push all "+" parameter at the command buffer @@ -1887,9 +1887,13 @@ void D_SRB2Main(void) else if (M_CheckParm("-skipintro")) { F_StartTitleScreen(); + CV_StealthSetValue(&cv_currprofile, -1); } else + { F_StartIntro(); // Tails 03-03-2002 + CV_StealthSetValue(&cv_currprofile, -1); + } CON_ToggleOff();