mirror of https://git.code.sf.net/p/quake/newtree
fix the +gamedir problem and fix my QFile removal
This commit is contained in:
parent
3d59dfed98
commit
cb04fd6496
|
@ -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 ();
|
||||||
|
|
|
@ -124,7 +124,6 @@ void
|
||||||
Qclose(FILE *file)
|
Qclose(FILE *file)
|
||||||
{
|
{
|
||||||
fclose(file);
|
fclose(file);
|
||||||
free(file);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
|
@ -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 ();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue