zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 09:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow specifying startup .con files via GAMEINFO.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-13 17:08:04 +02:00
parent 4fe3c50c7c
commit b5dbc3cf29
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/core/gamecontrol.cpp
View file

@ -757,7 +757,7 @@ static TArray<GrpEntry> 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.