From 676f1606340e81228b43c668ff39b3ea677ddef2 Mon Sep 17 00:00:00 2001 From: drfrag Date: Sat, 31 Oct 2020 23:54:19 +0100 Subject: [PATCH] - Autoload console background pics by Scuba Steve with the autoloadconpics CVAR. --- src/d_main.cpp | 14 +++++++++++++- src/d_main.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 4a28b40f6..2b7b131c7 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -228,6 +228,7 @@ CVAR (Bool, disableautoload, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBAL CVAR (Bool, autoloadbrightmaps, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) CVAR (Bool, autoloadlights, false, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) CVAR (Bool, autoloadwidescreen, true, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) +CVAR (Bool, autoloadconpics, true, CVAR_ARCHIVE | CVAR_NOINITCALL | CVAR_GLOBALCONFIG) CVAR (Bool, r_debug_disable_vis_filter, false, 0) bool wantToRestart; @@ -2006,6 +2007,11 @@ static FString ParseGameInfo(TArray &pwads, const char *fn, const char sc.MustGetNumber(); DoomStartupInfo.LoadWidescreen = !!sc.Number; } + else if (!nextKey.CompareNoCase("LOADCONPICS")) + { + sc.MustGetNumber(); + DoomStartupInfo.LoadConpics = !!sc.Number; + } else { // Silently ignore unknown properties @@ -2173,6 +2179,12 @@ static void AddAutoloadFiles(const char *autoname) if (wswad) D_AddFile (allwads, wswad); } + if (DoomStartupInfo.LoadConpics == 1 || (DoomStartupInfo.LoadConpics != 0 && autoloadconpics)) + { + const char *conpicswad = BaseFileSearch ("game_conpics_gfx.pk3", NULL); + if (conpicswad) + D_AddFile (allwads, conpicswad); + } } if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload) @@ -3020,7 +3032,7 @@ void D_Cleanup() // delete DoomStartupInfo data DoomStartupInfo.Name = ""; DoomStartupInfo.BkColor = DoomStartupInfo.FgColor = DoomStartupInfo.Type = 0; - DoomStartupInfo.LoadWidescreen = DoomStartupInfo.LoadLights = DoomStartupInfo.LoadBrightmaps = -1; + DoomStartupInfo.LoadConpics = DoomStartupInfo.LoadWidescreen = DoomStartupInfo.LoadLights = DoomStartupInfo.LoadBrightmaps = -1; GC::FullGC(); // clean up before taking down the object list. diff --git a/src/d_main.h b/src/d_main.h index 5f4fc1180..259106134 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -84,6 +84,7 @@ struct FStartupInfo int LoadLights = -1; int LoadBrightmaps = -1; int LoadWidescreen = -1; + int LoadConpics = -1; enum { DefaultStartup,