More tweaking of stuff, fixed a minor bug in the loc stuff, may still

have the crash causer though.
This commit is contained in:
Zephaniah E. Hull 2000-10-07 04:06:08 +00:00
parent 903fc1583e
commit dbda53e93b
4 changed files with 8 additions and 22 deletions

View file

@ -1586,8 +1586,8 @@ 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 (); //Cmd_StuffCmds_f ();
Cbuf_Execute_Sets (); //Cbuf_Execute_Sets ();
V_Init (); V_Init ();
SCR_InitCvars (); SCR_InitCvars ();

View file

@ -574,7 +574,6 @@ CL_ParseServerData
void CL_ParseServerData (void) void CL_ParseServerData (void)
{ {
char *str; char *str;
QFile *f;
char fn[MAX_OSPATH]; char fn[MAX_OSPATH];
qboolean cflag = false; qboolean cflag = false;
extern char gamedirfile[MAX_OSPATH]; extern char gamedirfile[MAX_OSPATH];
@ -611,25 +610,11 @@ void CL_ParseServerData (void)
//if it exists //if it exists
if (cflag) { if (cflag) {
int cl_warncmd_val = cl_warncmd->value; int cl_warncmd_val = cl_warncmd->value;
snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "config.cfg"); Cbuf_AddText ("cl_warncmd 0\n");
if ((f = Qopen(fn, "r")) != NULL) { Cbuf_AddText ("exec config.cfg\n");
Qclose(f); Cbuf_AddText ("exec frontend.cfg\n");
Cbuf_AddText ("cl_warncmd 0\n");
Cbuf_AddText ("exec config.cfg\n");
}
snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "frontend.cfg");
if ((f = Qopen(fn, "r")) != NULL) {
Qclose(f);
Cbuf_AddText ("cl_warncmd 0\n");
Cbuf_AddText ("exec frontend.cfg\n");
}
if (cl_autoexec->value) { if (cl_autoexec->value) {
snprintf(fn, sizeof(fn), "%s/%s", com_gamedir, "autoexec.cfg"); Cbuf_AddText ("exec autoexec.cfg\n");
if ((f = Qopen(fn, "r")) != NULL) {
Qclose(f);
Cbuf_AddText ("cl_warncmd 0\n");
Cbuf_AddText ("exec autoexec.cfg\n");
}
} }
snprintf(fn,sizeof(fn), "cl_warncmd %d\n", cl_warncmd_val); snprintf(fn,sizeof(fn), "cl_warncmd %d\n", cl_warncmd_val);
Cbuf_AddText(fn); Cbuf_AddText(fn);

View file

@ -548,7 +548,7 @@ static void R_DrawAliasModel (entity_t *e)
// allways give the gun some light // allways give the gun some light
if (e == &cl.viewent) if (e == &cl.viewent)
shadelight = min(shadelight, 24); shadelight = max(shadelight, 24);
for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++) for (lnum=0 ; lnum<MAX_DLIGHTS ; lnum++)
{ {

View file

@ -108,6 +108,7 @@ void locs_load(char *mapname)
t2[0] = '\0'; t2[0] = '\0';
locs_add(loc, t1); locs_add(loc, t1);
} }
Qclose(file);
} }
void locs_reset() void locs_reset()