qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-01-22 07:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

command line now overrides what's in the config file

Browse source
This commit is contained in:
Bill Currie 2000-05-21 10:08:27 +00:00
parent 1c81f61d0d
commit 3594de9738
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/cl_main.c
View file

@ -1710,6 +1710,9 @@ void Host_Init (quakeparms_t *parms)
Cmd_Exec_File (fs_globalcfg->string); Cmd_Exec_File (fs_globalcfg->string);
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
Cmd_StuffCmds_f ();
Cbuf_Execute ();
V_Init (); V_Init ();
CL_InitCvars (); CL_InitCvars ();
SCR_InitCvars (); SCR_InitCvars ();
@ -1721,12 +1724,6 @@ void Host_Init (quakeparms_t *parms)
Cmd_StuffCmds_f (); Cmd_StuffCmds_f ();
Cbuf_Execute (); Cbuf_Execute ();
// make these read-only
fs_basepath = Cvar_Get ("fs_basepath", fs_basepath->string, CVAR_ROM,
"the location of your game directories");
fs_sharepath = Cvar_Get ("fs_sharepath", fs_sharepath->string,
CVAR_ROM, "read-only game directories");
Host_FixupModelNames(); Host_FixupModelNames();
NET_Init (PORT_CLIENT); NET_Init (PORT_CLIENT);

4
source/quakefs.c
View file

@ -1052,10 +1052,10 @@ COM_InitFilesystem ( void )
int i; int i;
#endif #endif
fs_basepath = Cvar_Get ("fs_basepath", FS_USERPATH, CVAR_NONE, fs_basepath = Cvar_Get ("fs_basepath", FS_USERPATH, CVAR_ROM,
"the location of your game directories"); "the location of your game directories");
fs_sharepath = Cvar_Get ("fs_sharepath", FS_SHAREPATH, fs_sharepath = Cvar_Get ("fs_sharepath", FS_SHAREPATH,
CVAR_NONE, "read-only game directories"); CVAR_ROM, "read-only game directories");
Cmd_AddCommand ("gamedir", COM_Gamedir_f); Cmd_AddCommand ("gamedir", COM_Gamedir_f);
/* /*

3
source/sv_main.c
View file

@ -1875,6 +1875,9 @@ void SV_Init (quakeparms_t *parms)
Cmd_Exec_File (fs_globalcfg->string); Cmd_Exec_File (fs_globalcfg->string);
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
Cmd_StuffCmds_f ();
Cbuf_Execute ();
COM_Init (); COM_Init ();
PR_Init (); PR_Init ();