qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-16 16:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix handling of +set on the command line so the global config file can be

Browse source 
overridden (so long as it doesn't use setrom:)
This commit is contained in:
Bill Currie 2000-11-30 19:53:25 +00:00
parent 42b3a83bd9
commit c67a1b37e5
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/cl_main.c
View file

@ -1606,6 +1606,10 @@ void Host_Init (void)
Cmd_Exec_File (fs_globalcfg->string); Cmd_Exec_File (fs_globalcfg->string);
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
// execute +set again to override the config file
Cmd_StuffCmds_f ();
Cbuf_Execute_Sets ();
CL_Cam_Init_Cvars (); CL_Cam_Init_Cvars ();
CL_Input_Init_Cvars (); CL_Input_Init_Cvars ();
CL_Init_Cvars (); CL_Init_Cvars ();

4
source/sv_main.c
View file

@ -1845,8 +1845,10 @@ SV_Init (void)
fs_globalcfg = Cvar_Get ("fs_globalcfg", FS_GLOBALCFG, fs_globalcfg = Cvar_Get ("fs_globalcfg", FS_GLOBALCFG,
CVAR_ROM, "global configuration file"); CVAR_ROM, "global configuration file");
Cmd_Exec_File (fs_globalcfg->string); Cmd_Exec_File (fs_globalcfg->string);
Cbuf_Execute_Sets ();
// execute sets again after the config file has been parsed .. // execute +set again to override the config file
Cmd_StuffCmds_f ();
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
COM_Filesystem_Init_Cvars (); COM_Filesystem_Init_Cvars ();