X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=6b0cb342425499b67093ae5ea493216b51430274;hb=32d22283d65a73d16f420db3e38379085a159bc3;hp=d4b1a659eb435a630038bf056e24da20b7c39746;hpb=b44563794a2f0644800fdf82f2a848888de6c10b;p=xonotic%2Fdarkplaces.git

diff --git a/host_cmd.c b/host_cmd.c
index d4b1a659..6b0cb342 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -20,9 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-int	current_skill;
+int current_skill;
+char sv_spawnmap[MAX_QPATH];
+char sv_loadgame[MAX_OSPATH];
 
-dfunction_t *ED_FindFunction (char *name);
+mfunction_t *ED_FindFunction (char *name);
 
 /*
 ==================
@@ -48,12 +50,9 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
-	client_t	*client;
-	int			seconds;
-	int			minutes;
-	int			hours = 0;
-	int			j;
-	void		(*print) (char *fmt, ...);
+	client_t *client;
+	int seconds, minutes, hours = 0, j;
+	void (*print) (const char *fmt, ...);
 
 	if (cmd_source == src_command)
 	{
@@ -90,7 +89,7 @@ void Host_Status_f (void)
 		}
 		else
 			hours = 0;
-		print ("#%-2u %-16.16s  %3i  %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v.frags, hours, minutes, seconds);
+		print ("#%-2u %-16.16s  %3i  %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds);
 		print ("   %s\n", client->netconnection->address);
 	}
 }
@@ -114,8 +113,8 @@ void Host_God_f (void)
 	if (pr_global_struct->deathmatch)
 		return;
 
-	sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
-	if (!((int)sv_player->v.flags & FL_GODMODE) )
+	sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE;
+	if (!((int)sv_player->v->flags & FL_GODMODE) )
 		SV_ClientPrintf ("godmode OFF\n");
 	else
 		SV_ClientPrintf ("godmode ON\n");
@@ -132,8 +131,8 @@ void Host_Notarget_f (void)
 	if (pr_global_struct->deathmatch)
 		return;
 
-	sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
-	if (!((int)sv_player->v.flags & FL_NOTARGET) )
+	sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET;
+	if (!((int)sv_player->v->flags & FL_NOTARGET) )
 		SV_ClientPrintf ("notarget OFF\n");
 	else
 		SV_ClientPrintf ("notarget ON\n");
@@ -152,16 +151,16 @@ void Host_Noclip_f (void)
 	if (pr_global_struct->deathmatch)
 		return;
 
-	if (sv_player->v.movetype != MOVETYPE_NOCLIP)
+	if (sv_player->v->movetype != MOVETYPE_NOCLIP)
 	{
 		noclip_anglehack = true;
-		sv_player->v.movetype = MOVETYPE_NOCLIP;
+		sv_player->v->movetype = MOVETYPE_NOCLIP;
 		SV_ClientPrintf ("noclip ON\n");
 	}
 	else
 	{
 		noclip_anglehack = false;
-		sv_player->v.movetype = MOVETYPE_WALK;
+		sv_player->v->movetype = MOVETYPE_WALK;
 		SV_ClientPrintf ("noclip OFF\n");
 	}
 }
@@ -184,14 +183,14 @@ void Host_Fly_f (void)
 	if (pr_global_struct->deathmatch)
 		return;
 
-	if (sv_player->v.movetype != MOVETYPE_FLY)
+	if (sv_player->v->movetype != MOVETYPE_FLY)
 	{
-		sv_player->v.movetype = MOVETYPE_FLY;
+		sv_player->v->movetype = MOVETYPE_FLY;
 		SV_ClientPrintf ("flymode ON\n");
 	}
 	else
 	{
-		sv_player->v.movetype = MOVETYPE_WALK;
+		sv_player->v->movetype = MOVETYPE_WALK;
 		SV_ClientPrintf ("flymode OFF\n");
 	}
 }
@@ -208,7 +207,7 @@ void Host_Ping_f (void)
 	int		i, j;
 	float	total;
 	client_t	*client;
-	
+
 	if (cmd_source == src_command)
 	{
 		Cmd_ForwardToServer ();
@@ -236,7 +235,6 @@ SERVER TRANSITIONS
 ===============================================================================
 */
 
-
 /*
 ======================
 Host_Map_f
@@ -248,9 +246,6 @@ command from the console.  Active clients are kicked off.
 */
 void Host_Map_f (void)
 {
-	int i;
-	char name[MAX_QPATH];
-
 	if (cmd_source != src_command)
 		return;
 
@@ -263,33 +258,8 @@ void Host_Map_f (void)
 
 	key_dest = key_game;			// remove console or menu
 
-	cls.mapstring[0] = 0;
-	for (i=0 ; i<Cmd_Argc() ; i++)
-	{
-		strcat (cls.mapstring, Cmd_Argv(i));
-		strcat (cls.mapstring, " ");
-	}
-	strcat (cls.mapstring, "\n");
-
 	svs.serverflags = 0;			// haven't completed an episode yet
-	strcpy (name, Cmd_Argv(1));
-	SV_SpawnServer (name);
-	if (!sv.active)
-		return;
-
-	if (cls.state != ca_dedicated)
-	{
-		/*
-		strcpy (cls.spawnparms, "");
-
-		for (i=2 ; i<Cmd_Argc() ; i++)
-		{
-			strcat (cls.spawnparms, Cmd_Argv(i));
-			strcat (cls.spawnparms, " ");
-		}
-		*/
-		Cmd_ExecuteString ("connect local", src_command);
-	}
+	strcpy (sv_spawnmap, Cmd_Argv(1));
 }
 
 /*
@@ -301,8 +271,6 @@ Goes to a new map, taking all clients along
 */
 void Host_Changelevel_f (void)
 {
-	char	level[MAX_QPATH];
-
 	if (Cmd_Argc() != 2)
 	{
 		Con_Printf ("changelevel <levelname> : continue game on a new level\n");
@@ -314,8 +282,7 @@ void Host_Changelevel_f (void)
 		return;
 	}
 	SV_SaveSpawnparms ();
-	strcpy (level, Cmd_Argv(1));
-	SV_SpawnServer (level);
+	strcpy (sv_spawnmap, Cmd_Argv(1));
 }
 
 /*
@@ -327,16 +294,12 @@ Restarts the current server for a dead player
 */
 void Host_Restart_f (void)
 {
-	char	mapname[MAX_QPATH];
-
 	if (cls.demoplayback || !sv.active)
 		return;
 
 	if (cmd_source != src_command)
 		return;
-	strcpy (mapname, sv.name);	// must copy out, because it gets cleared
-								// in sv_spawnserver
-	SV_SpawnServer (mapname);
+	strcpy (sv_spawnmap, sv.name);
 }
 
 /*
@@ -362,8 +325,8 @@ User command to connect to server
 */
 void Host_Connect_f (void)
 {
-	char	name[MAX_QPATH];
-	
+	char name[MAX_QPATH];
+
 	cls.demonum = -1;		// stop demo loop in case this fails
 	if (cls.demoplayback)
 		CL_Disconnect ();
@@ -416,7 +379,7 @@ Host_Savegame_f
 void Host_Savegame_f (void)
 {
 	char	name[256];
-	QFile	*f;
+	qfile_t	*f;
 	int		i;
 	char	comment[SAVEGAME_COMMENT_LENGTH+1];
 
@@ -455,41 +418,42 @@ void Host_Savegame_f (void)
 
 	for (i=0 ; i<svs.maxclients ; i++)
 	{
-		if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
+		if (svs.clients[i].active && (svs.clients[i].edict->v->health <= 0) )
 		{
 			Con_Printf ("Can't savegame with a dead player\n");
 			return;
 		}
 	}
 
-	sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-	COM_DefaultExtension (name, ".sav");
+	strncpy (name, Cmd_Argv(1), sizeof (name) - 1);
+	name[sizeof (name) - 1] = '\0';
+	FS_DefaultExtension (name, ".sav");
 
 	Con_Printf ("Saving game to %s...\n", name);
-	f = Qopen (name, "w");
+	f = FS_Open (name, "w", false);
 	if (!f)
 	{
 		Con_Printf ("ERROR: couldn't open.\n");
 		return;
 	}
 
-	Qprintf (f, "%i\n", SAVEGAME_VERSION);
+	FS_Printf (f, "%i\n", SAVEGAME_VERSION);
 	Host_SavegameComment (comment);
-	Qprintf (f, "%s\n", comment);
+	FS_Printf (f, "%s\n", comment);
 	for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-		Qprintf (f, "%f\n", svs.clients->spawn_parms[i]);
-	Qprintf (f, "%d\n", current_skill);
-	Qprintf (f, "%s\n", sv.name);
-	Qprintf (f, "%f\n",sv.time);
+		FS_Printf (f, "%f\n", svs.clients->spawn_parms[i]);
+	FS_Printf (f, "%d\n", current_skill);
+	FS_Printf (f, "%s\n", sv.name);
+	FS_Printf (f, "%f\n",sv.time);
 
 // write the light styles
 
 	for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
 	{
 		if (sv.lightstyles[i])
-			Qprintf (f, "%s\n", sv.lightstyles[i]);
+			FS_Printf (f, "%s\n", sv.lightstyles[i]);
 		else
-			Qprintf (f,"m\n");
+			FS_Printf (f,"m\n");
 	}
 
 
@@ -497,9 +461,9 @@ void Host_Savegame_f (void)
 	for (i=0 ; i<sv.num_edicts ; i++)
 	{
 		ED_Write (f, EDICT_NUM(i));
-		Qflush (f);
+		FS_Flush (f);
 	}
-	Qclose (f);
+	FS_Close (f);
 	Con_Printf ("done.\n");
 }
 
@@ -513,18 +477,6 @@ Host_Loadgame_f
 */
 void Host_Loadgame_f (void)
 {
-	char	name[MAX_OSPATH];
-	QFile	*f;
-	char	mapname[MAX_QPATH];
-	float	time, tfloat;
-	char	buf[32768], *start;
-	char	*str;
-	int		i, r;
-	edict_t	*ent;
-	int		entnum;
-	int		version;
-	float	spawn_parms[NUM_SPAWN_PARMS];
-
 	if (cmd_source != src_command)
 		return;
 
@@ -534,44 +486,61 @@ void Host_Loadgame_f (void)
 		return;
 	}
 
-	cls.demonum = -1;		// stop demo loop in case this fails
+	strcpy (sv_loadgame, Cmd_Argv(1));
+	FS_DefaultExtension (sv_loadgame, ".sav");
+
+	Con_Printf ("Loading game from %s...\n", sv_loadgame);
+}
+
+void Host_PerformLoadGame(char *name)
+{
+	qfile_t *f;
+	char mapname[MAX_QPATH];
+	float time, tfloat;
+	char buf[32768];
+	const char *start;
+	char *str;
+	int i, r;
+	edict_t *ent;
+	int entnum;
+	int version;
+	float spawn_parms[NUM_SPAWN_PARMS];
 
-	sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-	COM_DefaultExtension (name, ".sav");
+	cls.demonum = -1;		// stop demo loop in case this fails
 
-	Con_Printf ("Loading game from %s...\n", name);
-	f = Qopen (name, "rz");
+	f = FS_Open (name, "r", false);
 	if (!f)
 	{
 		Con_Printf ("ERROR: couldn't open.\n");
 		return;
 	}
 
-	str = Qgetline (f);
+	str = FS_Getline (f);
 	sscanf (str, "%i\n", &version);
 	if (version != SAVEGAME_VERSION)
 	{
-		Qclose (f);
+		FS_Close (f);
 		Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
 		return;
 	}
 
 	SCR_BeginLoadingPlaque ();
 
-	str = Qgetline (f);
-	for (i=0 ; i<NUM_SPAWN_PARMS ; i++) {
-		str = Qgetline (f);
+	str = FS_Getline (f);
+	for (i = 0;i < NUM_SPAWN_PARMS;i++)
+	{
+		str = FS_Getline (f);
 		sscanf (str, "%f\n", &spawn_parms[i]);
 	}
 // this silliness is so we can load 1.06 save files, which have float skill values
-	str = Qgetline (f);
+	str = FS_Getline (f);
 	sscanf (str, "%f\n", &tfloat);
 	current_skill = (int)(tfloat + 0.1);
 	Cvar_SetValue ("skill", (float)current_skill);
 
-	strcpy (mapname, Qgetline (f));
+	strcpy (mapname, FS_Getline (f));
 
-	str = Qgetline (f);
+	str = FS_Getline (f);
 	sscanf (str, "%f\n",&time);
 
 	CL_Disconnect_f ();
@@ -587,20 +556,21 @@ void Host_Loadgame_f (void)
 
 // load the light styles
 
-	for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
+	for (i = 0;i < MAX_LIGHTSTYLES;i++)
 	{
-		str = Qgetline (f);
+		str = FS_Getline (f);
 		sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
 		strcpy (sv.lightstyles[i], str);
 	}
 
 // load the edicts out of the savegame file
-	entnum = -1;		// -1 is the globals
-	while (!Qeof(f))
+	// -1 is the globals
+	entnum = -1;
+	while (!FS_Eof (f))
 	{
-		for (i=0 ; i<sizeof(buf)-1 ; i++)
+		for (i = 0;i < (int)sizeof(buf) - 1;i++)
 		{
-			r = Qgetc (f);
+			r = FS_Getc (f);
 			if (r == EOF || !r)
 				break;
 			buf[i] = r;
@@ -611,41 +581,44 @@ void Host_Loadgame_f (void)
 			}
 		}
 		if (i == sizeof(buf)-1)
-			Sys_Error ("Loadgame buffer overflow");
+			Host_Error ("Loadgame buffer overflow");
 		buf[i] = 0;
 		start = buf;
-		start = COM_Parse(buf);
-		if (!com_token[0])
-			break;		// end of file
+		if (!COM_ParseToken(&start))
+		{
+			// end of file
+			break;
+		}
 		if (strcmp(com_token,"{"))
-			Sys_Error ("First token isn't a brace");
-			
+			Host_Error ("First token isn't a brace");
+
 		if (entnum == -1)
-		{	// parse the global vars
+		{
+			// parse the global vars
 			ED_ParseGlobals (start);
 		}
 		else
-		{	// parse an edict
-
+		{
+			// parse an edict
 			ent = EDICT_NUM(entnum);
-			memset (&ent->v, 0, progs->entityfields * 4);
+			memset (ent->v, 0, progs->entityfields * 4);
 			ent->free = false;
 			ED_ParseEdict (start, ent);
-	
-		// link it into the bsp tree
+
+			// link it into the bsp tree
 			if (!ent->free)
 				SV_LinkEdict (ent, false);
 		}
 
 		entnum++;
 	}
-	
+
 	sv.num_edicts = entnum;
 	sv.time = time;
 
-	Qclose (f);
+	FS_Close (f);
 
-	for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
+	for (i = 0;i < NUM_SPAWN_PARMS;i++)
 		svs.clients->spawn_parms[i] = spawn_parms[i];
 
 	if (cls.state != ca_dedicated)
@@ -692,16 +665,16 @@ void Host_Name_f (void)
 		if (strcmp(host_client->name, newName) != 0)
 			Con_Printf ("%s renamed to %s\n", host_client->name, newName);
 	strcpy (host_client->name, newName);
-	host_client->edict->v.netname = host_client->name - pr_strings;
-	
+	host_client->edict->v->netname = PR_SetString(host_client->name);
+
 // send notification to all clients
-	
+
 	MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
 	MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
 	MSG_WriteString (&sv.reliable_datagram, host_client->name);
 }
 
-	
+
 void Host_Version_f (void)
 {
 	Con_Printf ("Version: %s build %s\n", gamename, buildstring);
@@ -711,11 +684,11 @@ void Host_Say(qboolean teamonly)
 {
 	client_t *client;
 	client_t *save;
-	int		j;
-	char	*p;
+	int j;
+	const char *p1, *p2;
 	// LordHavoc: 256 char say messages
-	unsigned char	text[256];
-	qboolean	fromServer = false;
+	unsigned char text[256];
+	qboolean fromServer = false;
 
 	if (cmd_source == src_command)
 	{
@@ -734,34 +707,40 @@ void Host_Say(qboolean teamonly)
 	if (Cmd_Argc () < 2)
 		return;
 
-	save = host_client;
-
-	p = Cmd_Args();
-// remove quotes if present
-	if (*p == '"')
-	{
-		p++;
-		p[strlen(p)-1] = 0;
-	}
-
 // turn on color set 1
 	if (!fromServer)
-		sprintf (text, "%c%s: ", 1, save->name);
+		sprintf (text, "%c%s: ", 1, host_client->name);
 	else
 		sprintf (text, "%c<%s> ", 1, hostname.string);
 
-	j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
-	if (strlen(p) > j)
-		p[j] = 0;
+	save = host_client;
 
-	strcat (text, p);
-	strcat (text, "\n");
+	p1 = Cmd_Args();
+	p2 = p1 + strlen(p1);
+	// remove trailing newlines
+	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+		p2--;
+	// remove quotes if present
+	if (*p1 == '"')
+	{
+		p1++;
+		if (p2[-1] == '"')
+			p2--;
+		else
+			Con_Printf("Host_Say: missing end quote\n");
+	}
+	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+		p2--;
+	for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+		text[j++] = *p1++;
+	text[j++] = '\n';
+	text[j++] = 0;
 
 	for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
 	{
 		if (!client || !client->active || !client->spawned)
 			continue;
-		if (teamplay.integer && teamonly && client->edict->v.team != save->edict->v.team)
+		if (teamplay.integer && teamonly && client->edict->v->team != save->edict->v->team)
 			continue;
 		host_client = client;
 		SV_ClientPrintf("%s", text);
@@ -788,45 +767,62 @@ void Host_Tell_f(void)
 {
 	client_t *client;
 	client_t *save;
-	int		j;
-	char	*p;
-	char	text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+	int j;
+	const char *p1, *p2;
+	char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+	qboolean fromServer = false;
 
 	if (cmd_source == src_command)
 	{
-		Cmd_ForwardToServer ();
-		return;
+		if (cls.state == ca_dedicated)
+			fromServer = true;
+		else
+		{
+			Cmd_ForwardToServer ();
+			return;
+		}
 	}
 
 	if (Cmd_Argc () < 3)
 		return;
 
-	strcpy(text, host_client->name);
-	strcat(text, ": ");
-
-	p = Cmd_Args();
-
-// remove quotes if present
-	if (*p == '"')
-	{
-		p++;
-		p[strlen(p)-1] = 0;
+	if (!fromServer)
+		sprintf (text, "%s: ", host_client->name);
+	else
+		sprintf (text, "<%s> ", hostname.string);
+
+	p1 = Cmd_Args();
+	p2 = p1 + strlen(p1);
+	// remove the target name
+	while (p1 < p2 && *p1 != ' ')
+		p1++;
+	while (p1 < p2 && *p1 == ' ')
+		p1++;
+	// remove trailing newlines
+	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+		p2--;
+	// remove quotes if present
+	if (*p1 == '"')
+	{
+		p1++;
+		if (p2[-1] == '"')
+			p2--;
+		else
+			Con_Printf("Host_Say: missing end quote\n");
 	}
-
-// check length & truncate if necessary
-	j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
-	if (strlen(p) > j)
-		p[j] = 0;
-
-	strcat (text, p);
-	strcat (text, "\n");
+	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+		p2--;
+	for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+		text[j++] = *p1++;
+	text[j++] = '\n';
+	text[j++] = 0;
 
 	save = host_client;
 	for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
 	{
 		if (!client->active || !client->spawned)
 			continue;
-		if (Q_strcasecmp(client->name, Cmd_Argv(1)))
+		if (strcasecmp(client->name, Cmd_Argv(1)))
 			continue;
 		host_client = client;
 		SV_ClientPrintf("%s", text);
@@ -845,13 +841,13 @@ void Host_Color_f(void)
 {
 	int		top, bottom;
 	int		playercolor;
-	dfunction_t *f;
+	mfunction_t *f;
 	func_t	SV_ChangeTeam;
-	
+
 	if (Cmd_Argc() == 1)
 	{
 		Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
-		Con_Printf ("color <0-13> [0-13]\n");
+		Con_Printf ("color <0-15> [0-15]\n");
 		return;
 	}
 
@@ -862,7 +858,7 @@ void Host_Color_f(void)
 		top = atoi(Cmd_Argv(1));
 		bottom = atoi(Cmd_Argv(2));
 	}
-	
+
 	top &= 15;
 	// LordHavoc: allow skin colormaps 14 and 15 (was 13)
 	if (top > 15)
@@ -871,7 +867,7 @@ void Host_Color_f(void)
 	// LordHavoc: allow skin colormaps 14 and 15 (was 13)
 	if (bottom > 15)
 		bottom = 15;
-	
+
 	playercolor = top*16 + bottom;
 
 	if (cmd_source == src_command)
@@ -886,14 +882,14 @@ void Host_Color_f(void)
 	{
 		Con_DPrintf("Calling SV_ChangeTeam\n");
 		pr_global_struct->time = sv.time;
-		pr_globals[0] = playercolor;
+		pr_globals[OFS_PARM0] = playercolor;
 		pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
 		PR_ExecuteProgram (SV_ChangeTeam, "");
 	}
 	else
 	{
 		host_client->colors = playercolor;
-		host_client->edict->v.team = bottom + 1;
+		host_client->edict->v->team = bottom + 1;
 
 		// send notification to all clients
 		MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
@@ -915,12 +911,12 @@ void Host_Kill_f (void)
 		return;
 	}
 
-	if (sv_player->v.health <= 0)
+	if (sv_player->v->health <= 0)
 	{
 		SV_ClientPrintf ("Can't suicide -- already dead!\n");
 		return;
 	}
-	
+
 	pr_global_struct->time = sv.time;
 	pr_global_struct->self = EDICT_TO_PROG(sv_player);
 	PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
@@ -934,7 +930,7 @@ Host_Pause_f
 */
 void Host_Pause_f (void)
 {
-	
+
 	if (cmd_source == src_command)
 	{
 		Cmd_ForwardToServer ();
@@ -948,11 +944,11 @@ void Host_Pause_f (void)
 
 		if (sv.paused)
 		{
-			SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname);
+			SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname));
 		}
 		else
 		{
-			SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname);
+			SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname));
 		}
 
 	// send notification to all clients
@@ -982,7 +978,7 @@ void Host_PreSpawn_f (void)
 		Con_Printf ("prespawn not valid -- already spawned\n");
 		return;
 	}
-	
+
 	SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize);
 	MSG_WriteByte (&host_client->message, svc_signonnum);
 	MSG_WriteByte (&host_client->message, 2);
@@ -1000,7 +996,7 @@ void Host_Spawn_f (void)
 	client_t	*client;
 	edict_t	*ent;
 	func_t RestoreGame;
-	dfunction_t *f;
+	mfunction_t *f;
 
 	if (cmd_source == src_command)
 	{
@@ -1040,10 +1036,10 @@ void Host_Spawn_f (void)
 		// set up the edict
 		ent = host_client->edict;
 
-		memset (&ent->v, 0, progs->entityfields * 4);
-		ent->v.colormap = NUM_FOR_EDICT(ent);
-		ent->v.team = (host_client->colors & 15) + 1;
-		ent->v.netname = host_client->name - pr_strings;
+		memset (ent->v, 0, progs->entityfields * 4);
+		ent->v->colormap = NUM_FOR_EDICT(ent);
+		ent->v->team = (host_client->colors & 15) + 1;
+		ent->v->netname = PR_SetString(host_client->name);
 		if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
 			val->_float = host_client->pmodel;
 
@@ -1117,7 +1113,7 @@ void Host_Spawn_f (void)
 	ent = EDICT_NUM( 1 + (host_client - svs.clients) );
 	MSG_WriteByte (&host_client->message, svc_setangle);
 	for (i=0 ; i < 2 ; i++)
-		MSG_WriteAngle (&host_client->message, ent->v.angles[i] );
+		MSG_WriteAngle (&host_client->message, ent->v->angles[i] );
 	MSG_WriteAngle (&host_client->message, 0 );
 
 	SV_WriteClientdataToMessage (sv_player, &host_client->message);
@@ -1155,11 +1151,11 @@ Kicks a user off of the server
 */
 void Host_Kick_f (void)
 {
-	char		*who;
-	char		*message = NULL;
-	client_t	*save;
-	int			i;
-	qboolean	byNumber = false;
+	char *who;
+	const char *message = NULL;
+	client_t *save;
+	int i;
+	qboolean byNumber = false;
 
 	if (cmd_source == src_command)
 	{
@@ -1190,7 +1186,7 @@ void Host_Kick_f (void)
 		{
 			if (!host_client->active)
 				continue;
-			if (Q_strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
+			if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
 				break;
 		}
 	}
@@ -1198,10 +1194,12 @@ void Host_Kick_f (void)
 	if (i < svs.maxclients)
 	{
 		if (cmd_source == src_command)
+		{
 			if (cls.state == ca_dedicated)
 				who = "Console";
 			else
 				who = cl_name.string;
+		}
 		else
 			who = save->name;
 
@@ -1211,7 +1209,8 @@ void Host_Kick_f (void)
 
 		if (Cmd_Argc() > 2)
 		{
-			message = COM_Parse(Cmd_Args());
+			message = Cmd_Args();
+			COM_ParseToken(&message);
 			if (byNumber)
 			{
 				message++;							// skip the #
@@ -1226,7 +1225,7 @@ void Host_Kick_f (void)
 			SV_ClientPrintf ("Kicked by %s: %s\n", who, message);
 		else
 			SV_ClientPrintf ("Kicked by %s\n", who);
-		SV_DropClient (false);
+		SV_DropClient (false); // kicked
 	}
 
 	host_client = save;
@@ -1247,9 +1246,9 @@ Host_Give_f
 */
 void Host_Give_f (void)
 {
-	char	*t;
-	int		v;
-	eval_t	*val;
+	const char *t;
+	int v;
+	eval_t *val;
 
 	if (cmd_source == src_command)
 	{
@@ -1281,21 +1280,21 @@ void Host_Give_f (void)
 			if (t[0] == '6')
 			{
 				if (t[1] == 'a')
-				sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN;
+				sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN;
 				else
-				sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER;
+				sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER;
 			}
 			else if (t[0] == '9')
-				sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON;
+				sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
 			else if (t[0] == '0')
-				sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
+				sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
 			else if (t[0] >= '2')
-				sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+				sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
 		}
 		else
 		{
 			if (t[0] >= '2')
-				sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+				sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
 		}
 		break;
 
@@ -1306,7 +1305,7 @@ void Host_Give_f (void)
 				val->_float = v;
 		}
 
-		sv_player->v.ammo_shells = v;
+		sv_player->v->ammo_shells = v;
 		break;
 	case 'n':
 		if (gamemode == GAME_ROGUE)
@@ -1314,13 +1313,13 @@ void Host_Give_f (void)
 			if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
 			{
 				val->_float = v;
-				if (sv_player->v.weapon <= IT_LIGHTNING)
-					sv_player->v.ammo_nails = v;
+				if (sv_player->v->weapon <= IT_LIGHTNING)
+					sv_player->v->ammo_nails = v;
 			}
 		}
 		else
 		{
-			sv_player->v.ammo_nails = v;
+			sv_player->v->ammo_nails = v;
 		}
 		break;
 	case 'l':
@@ -1330,8 +1329,8 @@ void Host_Give_f (void)
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v.weapon > IT_LIGHTNING)
-					sv_player->v.ammo_nails = v;
+				if (sv_player->v->weapon > IT_LIGHTNING)
+					sv_player->v->ammo_nails = v;
 			}
 		}
 		break;
@@ -1342,13 +1341,13 @@ void Host_Give_f (void)
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v.weapon <= IT_LIGHTNING)
-					sv_player->v.ammo_rockets = v;
+				if (sv_player->v->weapon <= IT_LIGHTNING)
+					sv_player->v->ammo_rockets = v;
 			}
 		}
 		else
 		{
-			sv_player->v.ammo_rockets = v;
+			sv_player->v->ammo_rockets = v;
 		}
 		break;
 	case 'm':
@@ -1358,13 +1357,13 @@ void Host_Give_f (void)
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v.weapon > IT_LIGHTNING)
-					sv_player->v.ammo_rockets = v;
+				if (sv_player->v->weapon > IT_LIGHTNING)
+					sv_player->v->ammo_rockets = v;
 			}
 		}
 		break;
 	case 'h':
-		sv_player->v.health = v;
+		sv_player->v->health = v;
 		break;
 	case 'c':
 		if (gamemode == GAME_ROGUE)
@@ -1373,13 +1372,13 @@ void Host_Give_f (void)
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v.weapon <= IT_LIGHTNING)
-					sv_player->v.ammo_cells = v;
+				if (sv_player->v->weapon <= IT_LIGHTNING)
+					sv_player->v->ammo_cells = v;
 			}
 		}
 		else
 		{
-			sv_player->v.ammo_cells = v;
+			sv_player->v->ammo_cells = v;
 		}
 		break;
 	case 'p':
@@ -1389,8 +1388,8 @@ void Host_Give_f (void)
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v.weapon > IT_LIGHTNING)
-					sv_player->v.ammo_cells = v;
+				if (sv_player->v->weapon > IT_LIGHTNING)
+					sv_player->v->ammo_cells = v;
 			}
 		}
 		break;
@@ -1405,7 +1404,7 @@ edict_t	*FindViewthing (void)
 	for (i=0 ; i<sv.num_edicts ; i++)
 	{
 		e = EDICT_NUM(i);
-		if ( !strcmp (pr_strings + e->v.classname, "viewthing") )
+		if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
 			return e;
 	}
 	Con_Printf ("No viewthing on map\n");
@@ -1432,9 +1431,9 @@ void Host_Viewmodel_f (void)
 		Con_Printf ("Can't load %s\n", Cmd_Argv(1));
 		return;
 	}
-	
-	e->v.frame = 0;
-	cl.model_precache[(int)e->v.modelindex] = m;
+
+	e->v->frame = 0;
+	cl.model_precache[(int)e->v->modelindex] = m;
 }
 
 /*
@@ -1451,13 +1450,13 @@ void Host_Viewframe_f (void)
 	e = FindViewthing ();
 	if (!e)
 		return;
-	m = cl.model_precache[(int)e->v.modelindex];
+	m = cl.model_precache[(int)e->v->modelindex];
 
 	f = atoi(Cmd_Argv(1));
 	if (f >= m->numframes)
 		f = m->numframes-1;
 
-	e->v.frame = f;		
+	e->v->frame = f;
 }
 
 
@@ -1478,17 +1477,17 @@ void Host_Viewnext_f (void)
 {
 	edict_t	*e;
 	model_t	*m;
-	
+
 	e = FindViewthing ();
 	if (!e)
 		return;
-	m = cl.model_precache[(int)e->v.modelindex];
+	m = cl.model_precache[(int)e->v->modelindex];
 
-	e->v.frame = e->v.frame + 1;
-	if (e->v.frame >= m->numframes)
-		e->v.frame = m->numframes - 1;
+	e->v->frame = e->v->frame + 1;
+	if (e->v->frame >= m->numframes)
+		e->v->frame = m->numframes - 1;
 
-	PrintFrameName (m, e->v.frame);		
+	PrintFrameName (m, e->v->frame);
 }
 
 /*
@@ -1505,13 +1504,13 @@ void Host_Viewprev_f (void)
 	if (!e)
 		return;
 
-	m = cl.model_precache[(int)e->v.modelindex];
+	m = cl.model_precache[(int)e->v->modelindex];
 
-	e->v.frame = e->v.frame - 1;
-	if (e->v.frame < 0)
-		e->v.frame = 0;
+	e->v->frame = e->v->frame - 1;
+	if (e->v->frame < 0)
+		e->v->frame = 0;
 
-	PrintFrameName (m, e->v.frame);		
+	PrintFrameName (m, e->v->frame);
 }
 
 /*
@@ -1534,8 +1533,13 @@ void Host_Startdemos_f (void)
 
 	if (cls.state == ca_dedicated)
 	{
-		if (!sv.active)
-			Cbuf_AddText ("map start\n");
+		if (!sv.active && !sv_spawnmap[0])
+		{
+			if (gamemode == GAME_TRANSFUSION)
+				Cbuf_AddText ("map bb1\n");
+			else
+				Cbuf_AddText ("map start\n");
+		}
 		return;
 	}
 
@@ -1591,6 +1595,22 @@ void Host_Stopdemo_f (void)
 	CL_Disconnect ();
 }
 
+// LordHavoc: because we don't want to load things before the video starts,
+// we have to delay map and game loads until AFTER video is initialized
+void Host_PerformSpawnServerAndLoadGame(void)
+{
+	if (vid_hidden && cls.state != ca_dedicated)
+		return;
+	if (sv_loadgame[0])
+		Host_PerformLoadGame(sv_loadgame);
+	else if (sv_spawnmap[0])
+		SV_SpawnServer(sv_spawnmap);
+	if (sv.active && cls.state == ca_disconnected)
+		Cmd_ExecuteString ("connect local", src_command);
+	sv_loadgame[0] = 0;
+	sv_spawnmap[0] = 0;
+}
+
 //=============================================================================
 
 /*