OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

simplify lump filter setup and move the Doom special case for 'doom.doom' out of FResourceFile

Browse source
This commit is contained in:
Christoph Oelckers 2023-12-10 14:54:00 +01:00
commit 21acb9d467
3 changed files with 20 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/d_main.cpp
View file

@ -3145,7 +3145,6 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
if (!batchrun) Printf ("W_Init: Init WADfiles.\n");
LumpFilterInfo lfi;
lfi.dotFilter = LumpFilterIWAD.GetChars();
static const struct { int match; const char* name; } blanket[] =
{
@ -3161,6 +3160,15 @@ static int D_InitGame(const FIWADInfo* iwad_info, std::vector<std::string>& allw
}
lfi.gameTypeFilter.push_back(FStringf("game-%s", GameTypeName()).GetChars());
lfi.gameTypeFilter.push_back(LumpFilterIWAD.GetChars());
// Workaround for old Doom filter names.
if (LumpFilterIWAD.Compare("doom.id.doom") == 0)
{
lfi.gameTypeFilter.push_back("doom.doom");
}
GetReserved(lfi);
lfi.postprocessFunc = [&]()