qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 15:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

ent file support

Browse source
This commit is contained in:
Bill Currie 2003-03-25 17:49:27 +00:00
parent 87a31439e4
commit 25a7216b8c
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nq/source/sv_main.c
View file

@ -36,6 +36,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/sys.h" #include "QF/sys.h"
#include "QF/va.h"
#include "compat.h" #include "compat.h"
#include "host.h" #include "host.h"
@ -898,6 +899,7 @@ SV_SaveSpawnparms (void)
void void
SV_SpawnServer (const char *server) SV_SpawnServer (const char *server)
{ {
char *buf;
int i; int i;
edict_t *ent; edict_t *ent;
@ -1007,7 +1009,12 @@ SV_SpawnServer (const char *server)
// serverflags are for cross level information (sigils) // serverflags are for cross level information (sigils)
*sv_globals.serverflags = svs.serverflags; *sv_globals.serverflags = svs.serverflags;
ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities); if ((buf = QFS_LoadFile (va ("maps/%s.ent", server), 0))) {
ED_LoadFromFile (&sv_pr_state, buf);
free (buf);
} else {
ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
}
sv.active = true; sv.active = true;

8
qw/source/sv_init.c
View file

@ -302,6 +302,7 @@ SV_CheckModel (const char *mdl)
void void
SV_SpawnServer (const char *server) SV_SpawnServer (const char *server)
{ {
char *buf;
edict_t *ent; edict_t *ent;
int i; int i;
@ -411,7 +412,12 @@ SV_SpawnServer (const char *server)
SV_ProgStartFrame (); SV_ProgStartFrame ();
// load and spawn all other entities // load and spawn all other entities
ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities); if ((buf = QFS_LoadFile (va ("maps/%s.ent", server), 0))) {
ED_LoadFromFile (&sv_pr_state, buf);
free (buf);
} else {
ED_LoadFromFile (&sv_pr_state, sv.worldmodel->entities);
}
// look up some model indexes for specialized message compression // look up some model indexes for specialized message compression
SV_FindModelNumbers (); SV_FindModelNumbers ();