qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 12:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

private cbuf in map_cfg in nq too

Browse source
This commit is contained in:
Bill Currie 2003-08-13 06:23:20 +00:00
parent 70ec073904
commit e36ce15b5c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nq/source/cl_parse.c
View file

@ -43,12 +43,13 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/cmd.h" #include "QF/cmd.h"
#include "QF/console.h" #include "QF/console.h"
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/idparse.h"
#include "QF/input.h"
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/screen.h" #include "QF/screen.h"
#include "QF/skin.h" #include "QF/skin.h"
#include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_* #include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_*
#include "QF/input.h"
#include "client.h" #include "client.h"
#include "host.h" #include "host.h"
@ -223,6 +224,7 @@ static void
map_cfg (const char *mapname, int all) map_cfg (const char *mapname, int all)
{ {
char *name = malloc (strlen (mapname) + 4 + 1); char *name = malloc (strlen (mapname) + 4 + 1);
cbuf_t *cbuf = Cbuf_New (&id_interp);
QFile *f; QFile *f;
QFS_StripExtension (mapname, name); QFS_StripExtension (mapname, name);
@ -230,15 +232,16 @@ map_cfg (const char *mapname, int all)
QFS_FOpenFile (name, &f); QFS_FOpenFile (name, &f);
if (f) { if (f) {
Qclose (f); Qclose (f);
Cmd_Exec_File (host_cbuf, name, 1); Cmd_Exec_File (cbuf, name, 1);
} else { } else {
Cmd_Exec_File (host_cbuf, "maps_default.cfg", 1); Cmd_Exec_File (cbuf, "maps_default.cfg", 1);
} }
if (all) if (all)
Cbuf_Execute_Stack (host_cbuf); Cbuf_Execute_Stack (cbuf);
else else
Cbuf_Execute_Sets (host_cbuf); Cbuf_Execute_Sets (cbuf);
free (name); free (name);
Cbuf_Delete (cbuf);
} }
static void static void