fix the +gamedir problem and fix my QFile removal

This commit is contained in:
Joseph Carter 2000-05-22 21:32:14 +00:00
parent 3d59dfed98
commit cb04fd6496
3 changed files with 5 additions and 3 deletions

View File

@ -1711,7 +1711,7 @@ void Host_Init (quakeparms_t *parms)
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
Cmd_StuffCmds_f (); Cmd_StuffCmds_f ();
Cbuf_Execute (); Cbuf_Execute_Sets ();
V_Init (); V_Init ();
SCR_InitCvars (); SCR_InitCvars ();

View File

@ -124,7 +124,6 @@ void
Qclose(FILE *file) Qclose(FILE *file)
{ {
fclose(file); fclose(file);
free(file);
} }
int int

View File

@ -1873,10 +1873,13 @@ void SV_Init (quakeparms_t *parms)
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);
// execute sets again after the config file has been parsed ..
Cbuf_Execute_Sets (); Cbuf_Execute_Sets ();
// and now reprocess the cmdline's sets for overrides
Cmd_StuffCmds_f (); Cmd_StuffCmds_f ();
Cbuf_Execute (); Cbuf_Execute_Sets ();
COM_Init (); COM_Init ();