diff --git a/source/common/engine/startupinfo.h b/source/common/engine/startupinfo.h index f47fa351f..ec4ee2b30 100644 --- a/source/common/engine/startupinfo.h +++ b/source/common/engine/startupinfo.h @@ -9,11 +9,11 @@ struct FStartupInfo uint32_t FgColor; // Foreground color for title banner uint32_t BkColor; // Background color for title banner FString Song; + FString con; int Type; int LoadLights = -1; int LoadBrightmaps = -1; int LoadWidescreen = -1; - int modern = 0; enum { DefaultStartup, diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp index 5bfdd21c6..96431b3e6 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp @@ -757,7 +757,7 @@ static TArray SetupGame() if (ugroup.FileInfo.gamefilter.IsNotEmpty()) LumpFilter = ugroup.FileInfo.gamefilter; g_gameType |= ugroup.FileInfo.flags; } - if (userConfig.DefaultCon.IsEmpty()) userConfig.DefaultCon = selectedScript; + if (userConfig.DefaultCon.IsEmpty()) userConfig.DefaultCon = GameStartupInfo.con.IsNotEmpty()? GameStartupInfo.con : selectedScript; if (userConfig.DefaultDef.IsEmpty()) userConfig.DefaultDef = selectedDef; // This can only happen with a custom game that does not define any filter. diff --git a/source/core/initfs.cpp b/source/core/initfs.cpp index b0e6da37c..f511378ca 100644 --- a/source/core/initfs.cpp +++ b/source/core/initfs.cpp @@ -122,10 +122,10 @@ static TArray ParseGameInfo(TArray& pwads, const char* fn, con sc.MustGetString(); GameStartupInfo.BkColor = V_GetColor(NULL, sc); } - else if (!nextKey.CompareNoCase("MODERN")) + else if (!nextKey.CompareNoCase("CON")) { - sc.MustGetNumber(); - GameStartupInfo.modern = sc.Number ? 1 : -1; + sc.MustGetString(); + GameStartupInfo.con = sc.String;; } else {