DEHACKED lumps from IWAD now have precedence over embedded lumps and separate files

See https://forum.drdteam.org/viewtopic.php?t=7588

Processing order is now the same as in Chocolate Doom
prBoom+ loads separate files after all WAD lumps though
This makes sense but would change loading sequence existed in ZDoom for years
This commit is contained in:
alexey.lysiuk 2017-04-04 12:20:12 +03:00
commit dd30d2a045
3 changed files with 26 additions and 4 deletions

View file

@ -2507,6 +2507,9 @@ void D_DoomMain (void)
if (!batchrun) Printf ("DecalLibrary: Load decals.\n");
DecalLibrary.ReadAllDecals ();
// Load embedded Dehacked patches
D_LoadDehLumps(FromIWAD);
// [RH] Add any .deh and .bex files on the command line.
// If there are none, try adding any in the config file.
// Note that the command line overrides defaults from the config.
@ -2528,7 +2531,7 @@ void D_DoomMain (void)
}
// Load embedded Dehacked patches
D_LoadDehLumps();
D_LoadDehLumps(FromPWADs);
// Create replacements for dehacked pickups
FinishDehPatch();