Trivial fix for WIN32 version when GLOBAL_CFG_FILE is not defined.

This commit is contained in:
Tony Tyson 2000-04-28 02:46:02 +00:00
parent 4771585877
commit 3d58770b4e

View file

@ -556,20 +556,23 @@ Host_Init (quakeparms_t *parms)
// would have been nice if Cmd_Exec_f could have been used, but it // would have been nice if Cmd_Exec_f could have been used, but it
// only reads from within the quake file system, and changing that is // only reads from within the quake file system, and changing that is
// probably Not A Good Thing (tm). // probably Not A Good Thing (tm).
#if defined(GLOBAL_CFG_FILE)
global_cfg_file = Cvar_Get("global_cfg_file", GLOBAL_CFG_FILE, global_cfg_file = Cvar_Get("global_cfg_file", GLOBAL_CFG_FILE,
CVAR_ROM, "global configuration file"); CVAR_ROM, "global configuration file");
Cmd_Exec_File (global_cfg_file->string); Cmd_Exec_File (global_cfg_file->string);
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
#endif
CL_InitCvars (); CL_InitCvars ();
SCR_InitCvars (); SCR_InitCvars ();
VID_InitCvars (); VID_InitCvars ();
COM_Init (); COM_Init ();
#if defined(GLOBAL_CFG_FILE)
Cmd_Exec_File (global_cfg_file->string); Cmd_Exec_File (global_cfg_file->string);
Cbuf_Execute (); Cbuf_Execute ();
#endif
// reparse the command line for + commands other than set (sets still done, // reparse the command line for + commands other than set (sets still done,
// but it doesn't matter) // but it doesn't matter)