stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 06:00:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix ExecCfg not working on files added via command line

Browse source
This commit is contained in:
fickleheart 2020-02-24 11:44:45 -06:00
parent 1f8dbd1b8c
commit f8408f3c99
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/d_main.c
View file

@ -1152,6 +1152,12 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm()) if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm()); 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 // add any files specified on the command line with -file wadfile
// to the wad list // to the wad list
if (!(M_CheckParm("-connect") && !M_CheckParm("-server"))) if (!(M_CheckParm("-connect") && !M_CheckParm("-server")))
@ -1179,9 +1185,6 @@ void D_SRB2Main(void)
if (M_CheckParm("-server") || dedicated) if (M_CheckParm("-server") || dedicated)
netgame = server = true; 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 // adapt tables to SRB2's needs, including extra slots for dehacked file support
P_PatchInfoTables(); P_PatchInfoTables();
@ -1253,7 +1256,6 @@ void D_SRB2Main(void)
CONS_Printf("HU_Init(): Setting up heads up display.\n"); CONS_Printf("HU_Init(): Setting up heads up display.\n");
HU_Init(); HU_Init();
COM_Init();
CON_Init(); CON_Init();
D_RegisterServerCommands(); D_RegisterServerCommands();