- allow specifying a .def file in GAMEINFO.

This will be loaded on top of the regular .def files and not replace them.
ZDoom · Apr 17, 2021 · 27ca71a · 27ca71a
1 parent 3906d5c
commit 27ca71a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/source/common/engine/startupinfo.h b/source/common/engine/startupinfo.h
@@ -10,6 +10,7 @@ struct FStartupInfo
 	uint32_t BkColor;			// Background color for title banner
 	FString Song;
 	FString con;
+	FString def;
 	int Type;
 	int LoadLights = -1;
 	int LoadBrightmaps = -1;

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
@@ -1357,6 +1357,11 @@ void LoadDefinitions()
 			if (!loaddefinitionsfile(defsfile, true, false)) loaded = defsfile;
 		}
 	}
+
+	if (GameStartupInfo.def.IsNotEmpty())
+	{
+		loaddefinitionsfile(GameStartupInfo.def, false);	// Stuff from gameinfo.
+	}
 
 	if (loaded)
 	{

diff --git a/source/core/initfs.cpp b/source/core/initfs.cpp
@@ -127,6 +127,11 @@ static TArray<FString> ParseGameInfo(TArray<FString>& pwads, const char* fn, con
 			sc.MustGetString();
 			GameStartupInfo.con = sc.String;;
 		}
+		else if (!nextKey.CompareNoCase("DEF"))
+		{
+			sc.MustGetString();
+			GameStartupInfo.def = sc.String;;
+		}
 		else
 		{
 			// Silently ignore unknown properties