From f8408f3c99c515efac228d33f689aa77bd3b2946 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 24 Feb 2020 11:44:45 -0600
Subject: [PATCH] Fix ExecCfg not working on files added via command line
---
src/d_main.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 904ab3bf13..1af7857ee3 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1152,6 +1152,12 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm());
+ CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
+ Z_Init();
+
+ // Do this up here so that WADs loaded through the command line can use ExecCfg
+ COM_Init();
+
// add any files specified on the command line with -file wadfile
// to the wad list
if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
@@ -1179,9 +1185,6 @@ void D_SRB2Main(void)
if (M_CheckParm("-server") || dedicated)
netgame = server = true;
- CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
- Z_Init();
-
// adapt tables to SRB2's needs, including extra slots for dehacked file support
P_PatchInfoTables();
@@ -1253,7 +1256,6 @@ void D_SRB2Main(void)
CONS_Printf("HU_Init(): Setting up heads up display.\n");
HU_Init();
- COM_Init();
CON_Init();
D_RegisterServerCommands();
--
GitLab