qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-21 19:32:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed the #ifdef GLOBAL_CFG_FILE from host.c that someone put in, and added

Browse source 
a #define GLOBAL_CFG_FILE to win32/config.h
This commit is contained in:
Thad Ward 2000-04-29 05:49:07 +00:00
parent a95091b3c2
commit 8cefba82e2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/host.c
View file

@ -556,23 +556,19 @@ 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)

4
win32/config.h
View file

@ -212,3 +212,7 @@
/* Define what the base path should be */ /* Define what the base path should be */
#define FS_BASEPATH "." #define FS_BASEPATH "."
/* Define the name of the global config file */
#define GLOBAL_CFG_FILE ".\\qforge.cfg"