OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- pass lump filters as parameter when initializing the file system to reduce dependencies on high level state in the low level code.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 13:21:18 +02:00
commit 135f159927
15 changed files with 115 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/d_main.cpp
View file

@ -2480,7 +2480,25 @@ static int D_DoomMain_Internal (void)
}
if (!batchrun) Printf ("W_Init: Init WADfiles.\n");
Wads.InitMultipleFiles (allwads, iwad_info->DeleteLumps);
LumpFilterInfo lfi;
lfi.dotFilter = LumpFilterIWAD;
static const struct { int match; const char* name; } blanket[] =
{
{ GAME_Raven, "game-Raven" },
{ GAME_DoomStrifeChex, "game-DoomStrifeChex" },
{ GAME_DoomChex, "game-DoomChex" },
{ GAME_Any, NULL }
};
for (auto& inf : blanket)
{
if (gameinfo.gametype & inf.match) lfi.gameTypeFilter.Push(inf.name);
}
lfi.gameTypeFilter.Push(FStringf("game-%s", GameTypeName()));
Wads.InitMultipleFiles (allwads, iwad_info->DeleteLumps, false, &lfi);
allwads.Clear();
allwads.ShrinkToFit();
SetMapxxFlag();