qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

behave sanely when the requested map doesn't exist (Closes #44). I'm 

closing the bug because X closing on qf receiving TERM or KILL is due to
X segfaulting and thus is an X bug.
This commit is contained in:
Bill Currie 2002-10-11 03:15:41 +00:00
parent d7e7b7de7d
commit cddca4544d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nq/source/host_cmd.c
View File

@ -246,21 +246,35 @@ Host_Map_f (void)
{ {
int i; int i;
char name[MAX_QPATH]; char name[MAX_QPATH];
const char *expanded;
QFile *f;
if (cmd_source != src_command) if (cmd_source != src_command)
return; return;
if (Cmd_Argc () > 2) {
Con_Printf ("map <levelname> : continue game on a new level\n");
return;
}
if (Cmd_Argc () == 1) { if (Cmd_Argc () == 1) {
Con_Printf ("map is %s\n", sv.name); Con_Printf ("map is %s\n", sv.name);
return; return;
} }
// check to make sure the level exists
expanded = va ("maps/%s.bsp", Cmd_Argv (1));
COM_FOpenFile (expanded, &f);
if (!f) {
Con_Printf ("Can't find %s\n", expanded);
return;
}
Qclose (f);
cls.demonum = -1; // stop demo loop in case this fails cls.demonum = -1; // stop demo loop in case this fails
CL_Disconnect (); CL_Disconnect ();
Host_ShutdownServer (false); Host_ShutdownServer (false);
key_dest = key_game; // remove console or menu
// SCR_BeginLoadingPlaque (); // SCR_BeginLoadingPlaque ();
cls.mapstring[0] = 0; cls.mapstring[0] = 0;