From c5bcf935f04942f6c9ae5b6926a79e813f7cc4f1 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 9 Sep 2022 07:25:32 +0200 Subject: [PATCH] move G_ReloadDefaults() after DEH processing This makes sure the deh_set_blood_color variable can be properly parsed in D_SetBloodColor(). --- src/d_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index b5c69e0c..e1940281 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -2362,10 +2362,6 @@ void D_DoomMain(void) // Check for wolf levels haswolflevels = (W_CheckNumForName("map31") >= 0); - // Moved after WAD initialization because we are checking the COMPLVL lump - G_ReloadDefaults(); // killough 3/4/98: set defaults just loaded. - // jff 3/24/98 this sets startskill if it was -1 - putchar('\n'); // killough 3/6/98: add a newline, by popular demand :) // process deh in IWAD @@ -2387,6 +2383,10 @@ void D_DoomMain(void) PostProcessDeh(); + // Moved after WAD initialization because we are checking the COMPLVL lump + G_ReloadDefaults(); // killough 3/4/98: set defaults just loaded. + // jff 3/24/98 this sets startskill if it was -1 + // Check for -file in shareware if (modifiedgame) {