From fd6dd7f467335fd43a691ee084653fdf356f084f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 12 May 2021 00:36:04 +0200 Subject: [PATCH] - Skip the load screen if the level is started from the console. In this case the load screen is not helpful as it blocks the actual level start, requiring closing and reopening the console first before entering any commands that need the level. --- source/core/screenjob.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp index 993c97ce1..5126798b1 100644 --- a/source/core/screenjob.cpp +++ b/source/core/screenjob.cpp @@ -488,7 +488,11 @@ void ShowIntermission(MapRecord* fromMap, MapRecord* toMap, SummaryInfo* info, C if (tocluster == nullptr || !tocluster->intro.Create(runner, toMap, !!fromMap)) globalCutscenes.DefaultMapIntro.Create(runner, toMap, !!fromMap); } - globalCutscenes.LoadingScreen.Create(runner, toMap, true); + // Skip the load screen if the level is started from the console. + // In this case the load screen is not helpful as it blocks the actual level start, + // requiring closing and reopening the console first before entering any commands that need the level. + if (ConsoleState == c_up || ConsoleState == c_rising) + globalCutscenes.LoadingScreen.Create(runner, toMap, true); } else if (isShareware()) {