X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=fb4486f4395bdba63405d92333547672cbb16e9a;hp=652f1ce93df3691f6b778a5e364e36b3dfd5fdb1;hb=e24d834dcbcc61f28fdf0e2c1ba75693d9e23ed1;hpb=1612d8feb6a6f36e8502ef61ab0cc51168d44b65

diff --git a/host_cmd.c b/host_cmd.c
index 652f1ce9..fb4486f4 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -23,9 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int current_skill;
 char sv_spawnmap[MAX_QPATH];
 char sv_loadgame[MAX_OSPATH];
-int sv_restartmap;
 
-dfunction_t *ED_FindFunction (char *name);
+cvar_t sv_cheats = {0, "sv_cheats", "0"};
+qboolean allowcheats = false;
+
+mfunction_t *ED_FindFunction (char *name);
 
 /*
 ==================
@@ -52,7 +54,7 @@ Host_Status_f
 void Host_Status_f (void)
 {
 	client_t *client;
-	int seconds, minutes, hours = 0, j;
+	int seconds, minutes, hours = 0, j, players;
 	void (*print) (const char *fmt, ...);
 
 	if (cmd_source == src_command)
@@ -67,19 +69,18 @@ void Host_Status_f (void)
 	else
 		print = SV_ClientPrintf;
 
+	for (players = 0, j = 0;j < MAX_SCOREBOARD;j++)
+		if (svs.connectedclients[j])
+			players++;
 	print ("host:    %s\n", Cvar_VariableString ("hostname"));
 	print ("version: %s build %s\n", gamename, buildstring);
-	if (tcpipAvailable)
-		print ("tcp/ip:  %s\n", my_tcpip_address);
-	if (ipxAvailable)
-		print ("ipx:     %s\n", my_ipx_address);
 	print ("map:     %s\n", sv.name);
-	print ("players: %i active (%i max)\n\n", net_activeconnections, svs.maxclients);
-	for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
+	print ("players: %i active (%i max)\n\n", players, min(sv_maxplayers.integer, MAX_SCOREBOARD));
+	for (j = 0;j < MAX_SCOREBOARD;j++)
 	{
-		if (!client->active)
+		if (!(client = svs.connectedclients[j]))
 			continue;
-		seconds = (int)(net_time - client->netconnection->connecttime);
+		seconds = (int)(realtime - client->netconnection->connecttime);
 		minutes = seconds / 60;
 		if (minutes)
 		{
@@ -90,7 +91,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);
 	}
 }
@@ -111,11 +112,17 @@ void Host_God_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!sv_player)
 		return;
 
-	sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
-	if (!((int)sv_player->v.flags & FL_GODMODE) )
+	if (!allowcheats)
+	{
+		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		return;
+	}
+
+	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");
@@ -129,11 +136,17 @@ void Host_Notarget_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!sv_player)
 		return;
 
-	sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
-	if (!((int)sv_player->v.flags & FL_NOTARGET) )
+	if (!allowcheats)
+	{
+		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		return;
+	}
+
+	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");
@@ -149,19 +162,25 @@ void Host_Noclip_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!sv_player)
 		return;
 
-	if (sv_player->v.movetype != MOVETYPE_NOCLIP)
+	if (!allowcheats)
+	{
+		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		return;
+	}
+
+	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");
 	}
 }
@@ -181,17 +200,23 @@ void Host_Fly_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!sv_player)
 		return;
 
-	if (sv_player->v.movetype != MOVETYPE_FLY)
+	if (!allowcheats)
 	{
-		sv_player->v.movetype = MOVETYPE_FLY;
+		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		return;
+	}
+
+	if (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 +233,7 @@ void Host_Ping_f (void)
 	int		i, j;
 	float	total;
 	client_t	*client;
-	
+
 	if (cmd_source == src_command)
 	{
 		Cmd_ForwardToServer ();
@@ -216,9 +241,9 @@ void Host_Ping_f (void)
 	}
 
 	SV_ClientPrintf ("Client ping times:\n");
-	for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+	for (i = 0;i < MAX_SCOREBOARD;i++)
 	{
-		if (!client->active)
+		if (!(client = svs.connectedclients[i]))
 			continue;
 		total = 0;
 		for (j=0 ; j<NUM_PING_TIMES ; j++)
@@ -252,12 +277,12 @@ void Host_Map_f (void)
 
 	cls.demonum = -1;		// stop demo loop in case this fails
 
-	SCR_BeginLoadingPlaque ();
-
 	CL_Disconnect ();
 	Host_ShutdownServer(false);
 
 	key_dest = key_game;			// remove console or menu
+	SCR_BeginLoadingPlaque ();
+
 
 	svs.serverflags = 0;			// haven't completed an episode yet
 	strcpy (sv_spawnmap, Cmd_Argv(1));
@@ -300,7 +325,7 @@ void Host_Restart_f (void)
 
 	if (cmd_source != src_command)
 		return;
-	sv_restartmap = true;
+	strcpy (sv_spawnmap, sv.name);
 }
 
 /*
@@ -313,7 +338,7 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-	SCR_BeginLoadingPlaque ();
+	SCR_BeginLoadingPlaque();
 	cls.signon = 0;		// need new connection messages
 }
 
@@ -326,14 +351,7 @@ User command to connect to server
 */
 void Host_Connect_f (void)
 {
-	char name[MAX_QPATH];
-
-	cls.demonum = -1;		// stop demo loop in case this fails
-	if (cls.demoplayback)
-		CL_Disconnect ();
-	strcpy (name, Cmd_Argv(1));
-	CL_EstablishConnection (name);
-	Host_Reconnect_f ();
+	CL_EstablishConnection(Cmd_Argv(1));
 }
 
 
@@ -380,7 +398,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];
 
@@ -399,10 +417,21 @@ void Host_Savegame_f (void)
 		return;
 	}
 
-	if (svs.maxclients != 1)
+	for (i = 0;i < MAX_SCOREBOARD;i++)
 	{
-		Con_Printf ("Can't save multiplayer games.\n");
-		return;
+		if (svs.connectedclients[i])
+		{
+			if (i > 0)
+			{
+				Con_Printf("Can't save multiplayer games.\n");
+				return;
+			}
+			if (svs.connectedclients[i]->edict->v->deadflag)
+			{
+				Con_Printf("Can't savegame with a dead player\n");
+				return;
+			}
+		}
 	}
 
 	if (Cmd_Argc() != 2)
@@ -417,43 +446,35 @@ void Host_Savegame_f (void)
 		return;
 	}
 
-	for (i=0 ; i<svs.maxclients ; i++)
-	{
-		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.connectedclients[0]->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");
 	}
 
 
@@ -461,9 +482,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");
 }
 
@@ -486,15 +507,15 @@ void Host_Loadgame_f (void)
 		return;
 	}
 
-	sprintf (sv_loadgame, "%s/%s", com_gamedir, Cmd_Argv(1));
-	COM_DefaultExtension (sv_loadgame, ".sav");
+	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 *f;
+	qfile_t *f;
 	char mapname[MAX_QPATH];
 	float time, tfloat;
 	char buf[32768];
@@ -508,43 +529,42 @@ void Host_PerformLoadGame(char *name)
 
 	cls.demonum = -1;		// stop demo loop in case this fails
 
-	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);
+	str = FS_Getline (f);
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
 	{
-		str = Qgetline (f);
+		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 ();
-
+	allowcheats = sv_cheats.integer != 0;
 	SV_SpawnServer (mapname);
 	if (!sv.active)
 	{
@@ -558,7 +578,7 @@ void Host_PerformLoadGame(char *name)
 
 	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);
 	}
@@ -566,11 +586,11 @@ void Host_PerformLoadGame(char *name)
 // load the edicts out of the savegame file
 	// -1 is the globals
 	entnum = -1;
-	while (!Qeof(f))
+	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;
@@ -584,7 +604,7 @@ void Host_PerformLoadGame(char *name)
 			Host_Error ("Loadgame buffer overflow");
 		buf[i] = 0;
 		start = buf;
-		if (!COM_ParseToken(&start))
+		if (!COM_ParseToken(&start, false))
 		{
 			// end of file
 			break;
@@ -600,13 +620,17 @@ void Host_PerformLoadGame(char *name)
 		else
 		{
 			// parse an edict
+			if (entnum >= MAX_EDICTS)
+				Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
+			while (entnum >= sv.max_edicts)
+				SV_IncreaseEdicts();
 			ent = EDICT_NUM(entnum);
-			memset (&ent->v, 0, progs->entityfields * 4);
-			ent->free = false;
+			memset (ent->v, 0, progs->entityfields * 4);
+			ent->e->free = false;
 			ED_ParseEdict (start, ent);
 
 			// link it into the bsp tree
-			if (!ent->free)
+			if (!ent->e->free)
 				SV_LinkEdict (ent, false);
 		}
 
@@ -616,16 +640,14 @@ void Host_PerformLoadGame(char *name)
 	sv.num_edicts = entnum;
 	sv.time = time;
 
-	Qclose (f);
+	FS_Close (f);
 
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
-		svs.clients->spawn_parms[i] = spawn_parms[i];
+		svs.connectedclients[0]->spawn_parms[i] = spawn_parms[i];
 
-	if (cls.state != ca_dedicated)
-	{
-		CL_EstablishConnection ("local");
-		Host_Reconnect_f ();
-	}
+	// make sure we're connected to loopback
+	if (cls.state == ca_disconnected || !(cls.state == ca_connected && cls.netcon != NULL && LHNETADDRESS_GetAddressType(&cls.netcon->peeraddress) == LHNETADDRESSTYPE_LOOP))
+		CL_EstablishConnection("local");
 }
 
 //============================================================================
@@ -635,9 +657,10 @@ void Host_PerformLoadGame(char *name)
 Host_Name_f
 ======================
 */
+cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
 void Host_Name_f (void)
 {
-	char newName[64];
+	char newName[sizeof(host_client->name)];
 
 	if (Cmd_Argc () == 1)
 	{
@@ -646,10 +669,10 @@ void Host_Name_f (void)
 	}
 
 	if (Cmd_Argc () == 2)
-		strncpy(newName, Cmd_Argv(1), 15);
+		strncpy(newName, Cmd_Argv(1), sizeof(host_client->name) - 1);
 	else
-		strncpy(newName, Cmd_Args(), 15);
-	newName[15] = 0;
+		strncpy(newName, Cmd_Args(), sizeof(host_client->name) - 1);
+	newName[sizeof(host_client->name) - 1] = 0;
 
 	if (cmd_source == src_command)
 	{
@@ -661,17 +684,19 @@ void Host_Name_f (void)
 		return;
 	}
 
-	if (host_client->name[0] && strcmp(host_client->name, "unconnected") )
-		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;
+	if (strcmp(host_client->name, newName) && host_client->name[0] && strcmp(host_client->name, "unconnected"))
+		SV_BroadcastPrintf("%s changed name to %s\n", host_client->name, newName);
+	strcpy(host_client->name, newName);
+	strcpy(host_client->old_name, newName);
+	if (sv_player)
+		sv_player->v->netname = PR_SetString(host_client->name);
+	//Con_Printf("Host_Name_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), 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);
+	MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
+	MSG_WriteByte(&sv.reliable_datagram, host_client->number);
+	MSG_WriteString(&sv.reliable_datagram, host_client->name);
 }
 
 
@@ -682,7 +707,6 @@ void Host_Version_f (void)
 
 void Host_Say(qboolean teamonly)
 {
-	client_t *client;
 	client_t *save;
 	int j;
 	const char *p1, *p2;
@@ -707,14 +731,14 @@ void Host_Say(qboolean teamonly)
 	if (Cmd_Argc () < 2)
 		return;
 
+	save = host_client;
+
 // turn on color set 1
 	if (!fromServer)
 		sprintf (text, "%c%s: ", 1, host_client->name);
 	else
 		sprintf (text, "%c<%s> ", 1, hostname.string);
 
-	save = host_client;
-
 	p1 = Cmd_Args();
 	p2 = p1 + strlen(p1);
 	// remove trailing newlines
@@ -726,25 +750,21 @@ void Host_Say(qboolean teamonly)
 		p1++;
 		if (p2[-1] == '"')
 			p2--;
-		else
+		else if (fromServer)
 			Con_Printf("Host_Say: missing end quote\n");
+		else
+			SV_ClientPrintf("Host_Say: missing end quote\n");
 	}
 	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
 		p2--;
-	for (j = strlen(text);j < (sizeof(text) - 2) && p1 < 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)
-			continue;
-		host_client = client;
-		SV_ClientPrintf("%s", text);
-	}
+	for (j = 0;j < MAX_SCOREBOARD;j++)
+		if ((host_client = svs.connectedclients[j]) && host_client->spawned && (!teamplay.integer || host_client->edict->v->team == save->edict->v->team))
+			SV_ClientPrintf("%s", text);
 	host_client = save;
 
 	Sys_Printf("%s", &text[1]);
@@ -765,7 +785,6 @@ void Host_Say_Team_f(void)
 
 void Host_Tell_f(void)
 {
-	client_t *client;
 	client_t *save;
 	int j;
 	const char *p1, *p2;
@@ -807,27 +826,22 @@ void Host_Tell_f(void)
 		p1++;
 		if (p2[-1] == '"')
 			p2--;
+		else if (fromServer)
+			Con_Printf("Host_Tell: missing end quote\n");
 		else
-			Con_Printf("Host_Say: missing end quote\n");
+			SV_ClientPrintf("Host_Tell: missing end quote\n");
 	}
 	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
 		p2--;
-	for (j = strlen(text);j < (sizeof(text) - 2) && p1 < 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)))
-			continue;
-		host_client = client;
-		SV_ClientPrintf("%s", text);
-		break;
-	}
+	for (j = 0;j < MAX_SCOREBOARD;j++)
+		if ((host_client = svs.connectedclients[j]) && host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1)))
+			SV_ClientPrintf("%s", text);
 	host_client = save;
 }
 
@@ -837,11 +851,12 @@ void Host_Tell_f(void)
 Host_Color_f
 ==================
 */
+cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"};
 void Host_Color_f(void)
 {
 	int		top, bottom;
 	int		playercolor;
-	dfunction_t *f;
+	mfunction_t *f;
 	func_t	SV_ChangeTeam;
 
 	if (Cmd_Argc() == 1)
@@ -878,22 +893,29 @@ void Host_Color_f(void)
 		return;
 	}
 
-	if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+	if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
 	{
 		Con_DPrintf("Calling SV_ChangeTeam\n");
 		pr_global_struct->time = sv.time;
 		pr_globals[OFS_PARM0] = playercolor;
-		pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+		pr_global_struct->self = EDICT_TO_PROG(sv_player);
 		PR_ExecuteProgram (SV_ChangeTeam, "");
 	}
 	else
 	{
+		eval_t *val;
+		if (sv_player)
+		{
+			if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
+				val->_float = playercolor;
+			sv_player->v->team = bottom + 1;
+		}
 		host_client->colors = playercolor;
-		host_client->edict->v.team = bottom + 1;
+		host_client->old_colors = playercolor;
 
 		// send notification to all clients
 		MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-		MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
+		MSG_WriteByte (&sv.reliable_datagram, host_client->number);
 		MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
 	}
 }
@@ -911,14 +933,14 @@ void Host_Kill_f (void)
 		return;
 	}
 
-	if (sv_player->v.health <= 0)
+	if (!sv_player || 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_global_struct->self = EDICT_TO_PROG(host_client->edict);
 	PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
 }
 
@@ -930,7 +952,7 @@ Host_Pause_f
 */
 void Host_Pause_f (void)
 {
-	
+
 	if (cmd_source == src_command)
 	{
 		Cmd_ForwardToServer ();
@@ -941,22 +963,47 @@ void Host_Pause_f (void)
 	else
 	{
 		sv.paused ^= 1;
-
-		if (sv.paused)
-		{
-			SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname);
-		}
-		else
-		{
-			SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname);
-		}
-
-	// send notification to all clients
+		SV_BroadcastPrintf ("%s %spaused the game\n", host_client->name, sv.paused ? "" : "un");
+		// send notification to all clients
 		MSG_WriteByte (&sv.reliable_datagram, svc_setpause);
 		MSG_WriteByte (&sv.reliable_datagram, sv.paused);
 	}
 }
 
+/*
+======================
+Host_PModel_f
+LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+======================
+*/
+cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
+static void Host_PModel_f (void)
+{
+	int i;
+	eval_t *val;
+
+	if (Cmd_Argc () == 1)
+	{
+		Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
+		return;
+	}
+	i = atoi(Cmd_Argv(1));
+
+	if (cmd_source == src_command)
+	{
+		if (cl_pmodel.integer == i)
+			return;
+		Cvar_SetValue ("_cl_pmodel", i);
+		if (cls.state == ca_connected)
+			Cmd_ForwardToServer ();
+		return;
+	}
+
+	host_client->pmodel = i;
+	if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+		val->_float = i;
+}
+
 //===========================================================================
 
 
@@ -978,7 +1025,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);
@@ -992,29 +1039,34 @@ Host_Spawn_f
 */
 void Host_Spawn_f (void)
 {
-	int		i;
-	client_t	*client;
-	edict_t	*ent;
+	int i;
+	client_t *client;
 	func_t RestoreGame;
-	dfunction_t *f;
+	mfunction_t *f;
 
 	if (cmd_source == src_command)
 	{
-		Con_Printf ("spawn is not valid from the console\n");
+		Con_Printf("spawn is not valid from the console\n");
 		return;
 	}
 
 	if (host_client->spawned)
 	{
-		Con_Printf ("Spawn not valid -- already spawned\n");
+		Con_Printf("Spawn not valid -- already spawned\n");
+		return;
+	}
+
+	if (!sv_player)
+	{
+		Con_Printf("Host_Spawn: no edict??\n");
 		return;
 	}
 
 	// LordHavoc: moved this above the QC calls at FrikaC's request
-// send all current names, colors, and frag counts
+	// send all current names, colors, and frag counts
 	SZ_Clear (&host_client->message);
 
-// run the entrance script
+	// run the entrance script
 	if (sv.loadgame)
 	{
 		// loaded games are fully initialized already
@@ -1032,24 +1084,16 @@ void Host_Spawn_f (void)
 	}
 	else
 	{
-		eval_t *val;
 		// set up the edict
-		ent = host_client->edict;
+		ED_ClearEdict(sv_player);
 
-		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;
-		if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
-			val->_float = host_client->pmodel;
+		//Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), host_client->name);
 
 		// copy spawn parms out of the client_t
-
 		for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
 			(&pr_global_struct->parm1)[i] = host_client->spawn_parms[i];
 
 		// call the spawn function
-
 		pr_global_struct->time = sv.time;
 		pr_global_struct->self = EDICT_TO_PROG(sv_player);
 		PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
@@ -1061,24 +1105,26 @@ void Host_Spawn_f (void)
 	}
 
 
-// send time of update
+	// send time of update
 	MSG_WriteByte (&host_client->message, svc_time);
 	MSG_WriteFloat (&host_client->message, sv.time);
 
-	for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+	for (i = 0;i < MAX_SCOREBOARD;i++)
 	{
+		if (!(client = svs.connectedclients[i]))
+			continue;
 		MSG_WriteByte (&host_client->message, svc_updatename);
 		MSG_WriteByte (&host_client->message, i);
-		MSG_WriteString (&host_client->message, client->name);
+		MSG_WriteString (&host_client->message, client->old_name);
 		MSG_WriteByte (&host_client->message, svc_updatefrags);
 		MSG_WriteByte (&host_client->message, i);
 		MSG_WriteShort (&host_client->message, client->old_frags);
 		MSG_WriteByte (&host_client->message, svc_updatecolors);
 		MSG_WriteByte (&host_client->message, i);
-		MSG_WriteByte (&host_client->message, client->colors);
+		MSG_WriteByte (&host_client->message, client->old_colors);
 	}
 
-// send all current light styles
+	// send all current light styles
 	for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
 	{
 		MSG_WriteByte (&host_client->message, svc_lightstyle);
@@ -1086,9 +1132,7 @@ void Host_Spawn_f (void)
 		MSG_WriteString (&host_client->message, sv.lightstyles[i]);
 	}
 
-//
-// send some stats
-//
+	// send some stats
 	MSG_WriteByte (&host_client->message, svc_updatestat);
 	MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS);
 	MSG_WriteLong (&host_client->message, pr_global_struct->total_secrets);
@@ -1105,15 +1149,14 @@ void Host_Spawn_f (void)
 	MSG_WriteByte (&host_client->message, STAT_MONSTERS);
 	MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters);
 
-// send a fixangle
-// Never send a roll angle, because savegames can catch the server
-// in a state where it is expecting the client to correct the angle
-// and it won't happen if the game was just loaded, so you wind up
-// with a permanent head tilt
-	ent = EDICT_NUM( 1 + (host_client - svs.clients) );
+	// send a fixangle
+	// Never send a roll angle, because savegames can catch the server
+	// in a state where it is expecting the client to correct the angle
+	// and it won't happen if the game was just loaded, so you wind up
+	// with a permanent head tilt
 	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, sv_player->v->angles[i] );
 	MSG_WriteAngle (&host_client->message, 0 );
 
 	SV_WriteClientdataToMessage (sv_player, &host_client->message);
@@ -1157,15 +1200,7 @@ void Host_Kick_f (void)
 	int i;
 	qboolean byNumber = false;
 
-	if (cmd_source == src_command)
-	{
-		if (!sv.active)
-		{
-			Cmd_ForwardToServer ();
-			return;
-		}
-	}
-	else if (pr_global_struct->deathmatch)
+	if (cmd_source != src_command || !sv.active)
 		return;
 
 	save = host_client;
@@ -1173,25 +1208,22 @@ void Host_Kick_f (void)
 	if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
 	{
 		i = atof(Cmd_Argv(2)) - 1;
-		if (i < 0 || i >= svs.maxclients)
+		if (i < 0 || i >= MAX_SCOREBOARD || !(host_client = svs.connectedclients[i]))
 			return;
-		if (!svs.clients[i].active)
-			return;
-		host_client = &svs.clients[i];
 		byNumber = true;
 	}
 	else
 	{
-		for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++)
+		for (i = 0;i < MAX_SCOREBOARD;i++)
 		{
-			if (!host_client->active)
+			if (!(host_client = svs.connectedclients[i]))
 				continue;
-			if (Q_strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
+			if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
 				break;
 		}
 	}
 
-	if (i < svs.maxclients)
+	if (i < MAX_SCOREBOARD)
 	{
 		if (cmd_source == src_command)
 		{
@@ -1210,7 +1242,7 @@ void Host_Kick_f (void)
 		if (Cmd_Argc() > 2)
 		{
 			message = Cmd_Args();
-			COM_ParseToken(&message);
+			COM_ParseToken(&message, false);
 			if (byNumber)
 			{
 				message++;							// skip the #
@@ -1225,7 +1257,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;
@@ -1256,8 +1288,14 @@ void Host_Give_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!sv_player)
+		return;
+
+	if (!allowcheats)
+	{
+		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
 		return;
+	}
 
 	t = Cmd_Argv(1);
 	v = atoi (Cmd_Argv(2));
@@ -1280,32 +1318,29 @@ 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;
 
 	case 's':
-		if (gamemode == GAME_ROGUE)
-		{
-			if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
-				val->_float = v;
-		}
+		if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+			val->_float = v;
 
-		sv_player->v.ammo_shells = v;
+		sv_player->v->ammo_shells = v;
 		break;
 	case 'n':
 		if (gamemode == GAME_ROGUE)
@@ -1313,13 +1348,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':
@@ -1329,8 +1364,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;
@@ -1341,13 +1376,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':
@@ -1357,13 +1392,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)
@@ -1372,13 +1407,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':
@@ -1388,8 +1423,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;
@@ -1404,7 +1439,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");
@@ -1431,9 +1466,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;
 }
 
 /*
@@ -1450,13 +1485,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;
 }
 
 
@@ -1477,17 +1512,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);
 }
 
 /*
@@ -1504,13 +1539,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);
 }
 
 /*
@@ -1531,10 +1566,15 @@ void Host_Startdemos_f (void)
 {
 	int		i, c;
 
-	if (cls.state == ca_dedicated)
+	if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
 	{
-		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;
 	}
 
@@ -1544,11 +1584,15 @@ void Host_Startdemos_f (void)
 		Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS);
 		c = MAX_DEMOS;
 	}
-	Con_Printf ("%i demo(s) in loop\n", c);
+	Con_DPrintf ("%i demo(s) in loop\n", c);
 
 	for (i=1 ; i<c+1 ; i++)
 		strncpy (cls.demos[i-1], Cmd_Argv(i), sizeof(cls.demos[0])-1);
 
+	// LordHavoc: clear the remaining slots
+	for (;i <= MAX_DEMOS;i++)
+		cls.demos[i-1][0] = 0;
+
 	if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
 	{
 		cls.demonum = 0;
@@ -1594,24 +1638,19 @@ void Host_Stopdemo_f (void)
 // we have to delay map and game loads until AFTER video is initialized
 void Host_PerformSpawnServerAndLoadGame(void)
 {
-	if (vid_hidden)
+	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_dedicated)
-			Cmd_ExecuteString ("connect local", src_command);
-	}
-	else if (sv_restartmap)
-	{
-		strcpy(sv_spawnmap, sv.name);
+		allowcheats = sv_cheats.integer != 0;
 		SV_SpawnServer(sv_spawnmap);
 	}
 	sv_loadgame[0] = 0;
 	sv_spawnmap[0] = 0;
-	sv_restartmap = 0;
+	if (sv.active && cls.state == ca_disconnected)
+		Cmd_ExecuteString ("connect local", src_command);
 }
 
 //=============================================================================
@@ -1646,17 +1685,12 @@ void Host_InitCommands (void)
 	Cmd_AddCommand ("changelevel", Host_Changelevel_f);
 	Cmd_AddCommand ("connect", Host_Connect_f);
 	Cmd_AddCommand ("reconnect", Host_Reconnect_f);
-	Cmd_AddCommand ("name", Host_Name_f);
 	Cmd_AddCommand ("version", Host_Version_f);
 	Cmd_AddCommand ("say", Host_Say_f);
 	Cmd_AddCommand ("say_team", Host_Say_Team_f);
 	Cmd_AddCommand ("tell", Host_Tell_f);
-	Cmd_AddCommand ("color", Host_Color_f);
 	Cmd_AddCommand ("kill", Host_Kill_f);
 	Cmd_AddCommand ("pause", Host_Pause_f);
-	Cmd_AddCommand ("spawn", Host_Spawn_f);
-	Cmd_AddCommand ("begin", Host_Begin_f);
-	Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
 	Cmd_AddCommand ("kick", Host_Kick_f);
 	Cmd_AddCommand ("ping", Host_Ping_f);
 	Cmd_AddCommand ("load", Host_Loadgame_f);
@@ -1670,5 +1704,20 @@ void Host_InitCommands (void)
 	Cmd_AddCommand ("viewframe", Host_Viewframe_f);
 	Cmd_AddCommand ("viewnext", Host_Viewnext_f);
 	Cmd_AddCommand ("viewprev", Host_Viewprev_f);
+
+	Cvar_RegisterVariable (&cl_name);
+	Cmd_AddCommand ("name", Host_Name_f);
+	Cvar_RegisterVariable (&cl_color);
+	Cmd_AddCommand ("color", Host_Color_f);
+	if (gamemode == GAME_NEHAHRA)
+	{
+		Cvar_RegisterVariable (&cl_pmodel);
+		Cmd_AddCommand ("pmodel", Host_PModel_f);
+	}
+	Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
+	Cmd_AddCommand ("spawn", Host_Spawn_f);
+	Cmd_AddCommand ("begin", Host_Begin_f);
+
+	Cvar_RegisterVariable(&sv_cheats);
 }