X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=df867c23914faf60540154e74ba8d560c1fce805;hp=528af90a599c6503c00eec09d7532ebde48feac9;hb=a410368d7ed203c59512c77832c4b0cab4a42e05;hpb=af0b7a1fa11c2ceedeb9f66ca950f6c0bff8ad8f

diff --git a/host_cmd.c b/host_cmd.c
index 528af90a..df867c23 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 int current_skill;
-char sv_spawnmap[MAX_QPATH];
-char sv_loadgame[MAX_OSPATH];
-
 cvar_t sv_cheats = {0, "sv_cheats", "0"};
 qboolean allowcheats = false;
 
@@ -35,13 +32,8 @@ Host_Quit_f
 ==================
 */
 
-extern qboolean host_shuttingdown;
 void Host_Quit_f (void)
 {
-	host_shuttingdown = true;
-	CL_Disconnect ();
-	Host_ShutdownServer(false);
-
 	Sys_Quit ();
 }
 
@@ -53,6 +45,7 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
+	const char *protocolname;
 	client_t *client;
 	int seconds, minutes, hours = 0, j, players;
 	void (*print) (const char *fmt, ...);
@@ -74,13 +67,24 @@ void Host_Status_f (void)
 			players++;
 	print ("host:    %s\n", Cvar_VariableString ("hostname"));
 	print ("version: %s build %s\n", gamename, buildstring);
+	switch(sv.protocol)
+	{
+		case PROTOCOL_QUAKE: protocolname = sv.netquakecompatible ? "QUAKE" : "QUAKEDP";break;
+		case PROTOCOL_DARKPLACES1: protocolname = "PROTOCOL_DARKPLACES1";break;
+		case PROTOCOL_DARKPLACES2: protocolname = "PROTOCOL_DARKPLACES2";break;
+		case PROTOCOL_DARKPLACES3: protocolname = "PROTOCOL_DARKPLACES3";break;
+		case PROTOCOL_DARKPLACES4: protocolname = "PROTOCOL_DARKPLACES4";break;
+		case PROTOCOL_DARKPLACES5: protocolname = "PROTOCOL_DARKPLACES5";break;
+		default: protocolname = "PROTOCOL_UNKNOWN";break;
+	}
+	print ("protocol: %i (%s)\n", sv.protocol, protocolname);
 	print ("map:     %s\n", sv.name);
 	print ("players: %i active (%i max)\n\n", players, svs.maxclients);
 	for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
 	{
 		if (!client->active)
 			continue;
-		seconds = (int)(realtime - client->netconnection->connecttime);
+		seconds = (int)(realtime - client->connecttime);
 		minutes = seconds / 60;
 		if (minutes)
 		{
@@ -92,7 +96,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 ("   %s\n", client->netconnection->address);
+		print ("   %s\n", client->netconnection ? client->netconnection->address : "botclient");
 	}
 }
 
@@ -112,20 +116,17 @@ void Host_God_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
-		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		SV_ClientPrint("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");
+	host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_GODMODE;
+	if (!((int)host_client->edict->v->flags & FL_GODMODE) )
+		SV_ClientPrint("godmode OFF\n");
 	else
-		SV_ClientPrintf ("godmode ON\n");
+		SV_ClientPrint("godmode ON\n");
 }
 
 void Host_Notarget_f (void)
@@ -136,20 +137,17 @@ void Host_Notarget_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
-		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		SV_ClientPrint("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");
+	host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_NOTARGET;
+	if (!((int)host_client->edict->v->flags & FL_NOTARGET) )
+		SV_ClientPrint("notarget OFF\n");
 	else
-		SV_ClientPrintf ("notarget ON\n");
+		SV_ClientPrint("notarget ON\n");
 }
 
 qboolean noclip_anglehack;
@@ -162,26 +160,23 @@ void Host_Noclip_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
-		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
 		return;
 	}
 
-	if (sv_player->v->movetype != MOVETYPE_NOCLIP)
+	if (host_client->edict->v->movetype != MOVETYPE_NOCLIP)
 	{
 		noclip_anglehack = true;
-		sv_player->v->movetype = MOVETYPE_NOCLIP;
-		SV_ClientPrintf ("noclip ON\n");
+		host_client->edict->v->movetype = MOVETYPE_NOCLIP;
+		SV_ClientPrint("noclip ON\n");
 	}
 	else
 	{
 		noclip_anglehack = false;
-		sv_player->v->movetype = MOVETYPE_WALK;
-		SV_ClientPrintf ("noclip OFF\n");
+		host_client->edict->v->movetype = MOVETYPE_WALK;
+		SV_ClientPrint("noclip OFF\n");
 	}
 }
 
@@ -200,24 +195,21 @@ void Host_Fly_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
-		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
 		return;
 	}
 
-	if (sv_player->v->movetype != MOVETYPE_FLY)
+	if (host_client->edict->v->movetype != MOVETYPE_FLY)
 	{
-		sv_player->v->movetype = MOVETYPE_FLY;
-		SV_ClientPrintf ("flymode ON\n");
+		host_client->edict->v->movetype = MOVETYPE_FLY;
+		SV_ClientPrint("flymode ON\n");
 	}
 	else
 	{
-		sv_player->v->movetype = MOVETYPE_WALK;
-		SV_ClientPrintf ("flymode OFF\n");
+		host_client->edict->v->movetype = MOVETYPE_WALK;
+		SV_ClientPrint("flymode OFF\n");
 	}
 }
 
@@ -240,7 +232,7 @@ void Host_Ping_f (void)
 		return;
 	}
 
-	SV_ClientPrintf ("Client ping times:\n");
+	SV_ClientPrint("Client ping times:\n");
 	for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
 	{
 		if (!client->active)
@@ -249,7 +241,7 @@ void Host_Ping_f (void)
 		for (j=0 ; j<NUM_PING_TIMES ; j++)
 			total+=client->ping_times[j];
 		total /= NUM_PING_TIMES;
-		SV_ClientPrintf ("%4i %s\n", (int)(total*1000), client->name);
+		SV_ClientPrintf("%4i %s\n", (int)(total*1000), client->name);
 	}
 }
 
@@ -272,22 +264,33 @@ command from the console.  Active clients are kicked off.
 */
 void Host_Map_f (void)
 {
+	char level[MAX_QPATH];
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("map <levelname> : start a new game (kicks off all players)\n");
+		return;
+	}
+
 	if (cmd_source != src_command)
 		return;
 
+	SCR_BeginLoadingPlaque ();
 	cls.demonum = -1;		// stop demo loop in case this fails
 
 	CL_Disconnect ();
 	Host_ShutdownServer(false);
 
-	key_dest = key_game;			// remove console or menu
-	SCR_BeginLoadingPlaque ();
-
+	// remove console or menu
+	key_dest = key_game;
+	key_consoleactive = 0;
 
 	svs.serverflags = 0;			// haven't completed an episode yet
-	strcpy (sv_spawnmap, Cmd_Argv(1));
-	if (host_initialized)
-		Host_PerformSpawnServerAndLoadGame();
+	allowcheats = sv_cheats.integer != 0;
+	strcpy(level, Cmd_Argv(1));
+	SV_SpawnServer(level);
+	if (sv.active && cls.state == ca_disconnected)
+		CL_EstablishConnection("local:1");
 }
 
 /*
@@ -299,20 +302,32 @@ 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");
+		Con_Print("changelevel <levelname> : continue game on a new level\n");
 		return;
 	}
 	if (!sv.active || cls.demoplayback)
 	{
-		Con_Printf ("Only the server may changelevel\n");
+		Con_Print("Only the server may changelevel\n");
 		return;
 	}
+	if (cmd_source != src_command)
+		return;
+
+	// remove console or menu
+	key_dest = key_game;
+	key_consoleactive = 0;
+
 	SV_SaveSpawnparms ();
-	strcpy (sv_spawnmap, Cmd_Argv(1));
-	if (host_initialized)
-		Host_PerformSpawnServerAndLoadGame();
+	SCR_BeginLoadingPlaque();
+	allowcheats = sv_cheats.integer != 0;
+	strcpy(level, Cmd_Argv(1));
+	SV_SpawnServer(level);
+	if (sv.active && cls.state == ca_disconnected)
+		CL_EstablishConnection("local:1");
 }
 
 /*
@@ -324,14 +339,31 @@ Restarts the current server for a dead player
 */
 void Host_Restart_f (void)
 {
-	if (cls.demoplayback || !sv.active)
+	char mapname[MAX_QPATH];
+	
+	if (Cmd_Argc() != 1)
+	{
+		Con_Print("restart : restart current level\n");
 		return;
-
+	}
+	if (!sv.active || cls.demoplayback)
+	{
+		Con_Print("Only the server may restart\n");
+		return;
+	}
 	if (cmd_source != src_command)
 		return;
-	strcpy (sv_spawnmap, sv.name);
-	if (host_initialized)
-		Host_PerformSpawnServerAndLoadGame();
+
+	// remove console or menu
+	key_dest = key_game;
+	key_consoleactive = 0;
+
+	SCR_BeginLoadingPlaque();
+	allowcheats = sv_cheats.integer != 0;
+	strcpy(mapname, sv.name);
+	SV_SpawnServer(mapname);
+	if (sv.active && cls.state == ca_disconnected)
+		CL_EstablishConnection("local:1");
 }
 
 /*
@@ -344,6 +376,16 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
+	if (Cmd_Argc() != 1)
+	{
+		Con_Print("reconnect : wait for signon messages again\n");
+		return;
+	}
+	if (!cls.signon)
+	{
+		//Con_Print("reconnect: no signon, ignoring reconnect\n");
+		return;
+	}
 	SCR_BeginLoadingPlaque();
 	cls.signon = 0;		// need new connection messages
 }
@@ -357,6 +399,11 @@ User command to connect to server
 */
 void Host_Connect_f (void)
 {
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
+		return;
+	}
 	CL_EstablishConnection(Cmd_Argv(1));
 }
 
@@ -413,13 +460,13 @@ void Host_Savegame_f (void)
 
 	if (cls.state != ca_connected || !sv.active)
 	{
-		Con_Printf ("Not playing a local game.\n");
+		Con_Print("Not playing a local game.\n");
 		return;
 	}
 
 	if (cl.intermission)
 	{
-		Con_Printf ("Can't save in intermission.\n");
+		Con_Print("Can't save in intermission.\n");
 		return;
 	}
 
@@ -429,12 +476,12 @@ void Host_Savegame_f (void)
 		{
 			if (i > 0)
 			{
-				Con_Printf("Can't save multiplayer games.\n");
+				Con_Print("Can't save multiplayer games.\n");
 				return;
 			}
 			if (svs.clients[i].edict->v->deadflag)
 			{
-				Con_Printf("Can't savegame with a dead player\n");
+				Con_Print("Can't savegame with a dead player\n");
 				return;
 			}
 		}
@@ -442,44 +489,44 @@ void Host_Savegame_f (void)
 
 	if (Cmd_Argc() != 2)
 	{
-		Con_Printf ("save <savename> : save a game\n");
+		Con_Print("save <savename> : save a game\n");
 		return;
 	}
 
 	if (strstr(Cmd_Argv(1), ".."))
 	{
-		Con_Printf ("Relative pathnames are not allowed.\n");
+		Con_Print("Relative pathnames are not allowed.\n");
 		return;
 	}
 
 	strlcpy (name, Cmd_Argv(1), sizeof (name));
 	FS_DefaultExtension (name, ".sav", sizeof (name));
 
-	Con_Printf ("Saving game to %s...\n", name);
+	Con_Printf("Saving game to %s...\n", name);
 	f = FS_Open (name, "w", false);
 	if (!f)
 	{
-		Con_Printf ("ERROR: couldn't open.\n");
+		Con_Print("ERROR: couldn't open.\n");
 		return;
 	}
 
-	FS_Printf (f, "%i\n", SAVEGAME_VERSION);
+	FS_Printf(f, "%i\n", SAVEGAME_VERSION);
 	Host_SavegameComment (comment);
-	FS_Printf (f, "%s\n", comment);
+	FS_Printf(f, "%s\n", comment);
 	for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-		FS_Printf (f, "%f\n", svs.clients[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);
+		FS_Printf(f, "%f\n", svs.clients[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])
-			FS_Printf (f, "%s\n", sv.lightstyles[i]);
+			FS_Printf(f, "%s\n", sv.lightstyles[i]);
 		else
-			FS_Printf (f,"m\n");
+			FS_Print(f,"m\n");
 	}
 
 
@@ -490,7 +537,7 @@ void Host_Savegame_f (void)
 		FS_Flush (f);
 	}
 	FS_Close (f);
-	Con_Printf ("done.\n");
+	Con_Print("done.\n");
 }
 
 
@@ -502,25 +549,9 @@ Host_Loadgame_f
 ===============
 */
 void Host_Loadgame_f (void)
-{
-	if (cmd_source != src_command)
-		return;
-
-	if (Cmd_Argc() != 2)
-	{
-		Con_Printf ("load <savename> : load a game\n");
-		return;
-	}
-
-	strcpy (sv_loadgame, Cmd_Argv(1));
-	FS_DefaultExtension (sv_loadgame, ".sav", sizeof (sv_loadgame));
-
-	Con_Printf ("Loading game from %s...\n", sv_loadgame);
-}
-
-void Host_PerformLoadGame(char *name)
 {
 	qfile_t *f;
+	char filename[MAX_QPATH];
 	char mapname[MAX_QPATH];
 	float time, tfloat;
 	char buf[32768];
@@ -532,12 +563,26 @@ void Host_PerformLoadGame(char *name)
 	int version;
 	float spawn_parms[NUM_SPAWN_PARMS];
 
+	if (cmd_source != src_command)
+		return;
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("load <savename> : load a game\n");
+		return;
+	}
+
+	strcpy (filename, Cmd_Argv(1));
+	FS_DefaultExtension (filename, ".sav", sizeof (filename));
+
+	Con_Printf("Loading game from %s...\n", filename);
+
 	cls.demonum = -1;		// stop demo loop in case this fails
 
-	f = FS_Open (name, "r", false);
+	f = FS_Open (filename, "r", false);
 	if (!f)
 	{
-		Con_Printf ("ERROR: couldn't open.\n");
+		Con_Print("ERROR: couldn't open.\n");
 		return;
 	}
 
@@ -546,7 +591,7 @@ void Host_PerformLoadGame(char *name)
 	if (version != SAVEGAME_VERSION)
 	{
 		FS_Close (f);
-		Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
+		Con_Printf("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
 		return;
 	}
 
@@ -573,7 +618,7 @@ void Host_PerformLoadGame(char *name)
 	SV_SpawnServer (mapname);
 	if (!sv.active)
 	{
-		Con_Printf ("Couldn't load map\n");
+		Con_Print("Couldn't load map\n");
 		return;
 	}
 	sv.paused = true;		// pause until all clients connect
@@ -591,7 +636,7 @@ void Host_PerformLoadGame(char *name)
 // load the edicts out of the savegame file
 	// -1 is the globals
 	entnum = -1;
-	while (!FS_Eof (f))
+	for (;;)
 	{
 		for (i = 0;i < (int)sizeof(buf) - 1;i++)
 		{
@@ -605,6 +650,8 @@ void Host_PerformLoadGame(char *name)
 				break;
 			}
 		}
+		if (r == EOF)
+			break;
 		if (i == sizeof(buf)-1)
 			Host_Error ("Loadgame buffer overflow");
 		buf[i] = 0;
@@ -652,7 +699,7 @@ void Host_PerformLoadGame(char *name)
 
 	// 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");
+		CL_EstablishConnection("local:1");
 }
 
 //============================================================================
@@ -665,11 +712,12 @@ Host_Name_f
 cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
 void Host_Name_f (void)
 {
+	int i, j;
 	char newName[sizeof(host_client->name)];
 
 	if (Cmd_Argc () == 1)
 	{
-		Con_Printf ("\"name\" is \"%s\"\n", cl_name.string);
+		Con_Printf("\"name\" is \"%s\"\n", cl_name.string);
 		return;
 	}
 
@@ -678,42 +726,54 @@ void Host_Name_f (void)
 	else
 		strlcpy (newName, Cmd_Args(), sizeof (newName));
 
+	for (i = 0, j = 0;newName[i];i++)
+		if (newName[i] != '\r' && newName[i] != '\n')
+			newName[j++] = newName[i];
+	newName[j] = 0;
+
 	if (cmd_source == src_command)
 	{
-		if (strcmp(cl_name.string, newName) == 0)
-			return;
 		Cvar_Set ("_cl_name", newName);
 		if (cls.state == ca_connected)
 			Cmd_ForwardToServer ();
 		return;
 	}
 
-	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
+	if (sv.time < host_client->nametime)
+	{
+		SV_ClientPrintf("You can't change name more than once every 5 seconds!\n");
+		return;
+	}
+	
+	host_client->nametime = sv.time + 5;
 
-	MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
-	MSG_WriteByte(&sv.reliable_datagram, host_client->number);
-	MSG_WriteString(&sv.reliable_datagram, host_client->name);
+	// point the string back at updateclient->name to keep it safe
+	strlcpy (host_client->name, newName, sizeof (host_client->name));
+	host_client->edict->v->netname = PR_SetString(host_client->name);
+	if (strcmp(host_client->old_name, host_client->name))
+	{
+		if (host_client->spawned)
+			SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name);
+		strcpy(host_client->old_name, 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);
+	Con_Printf("Version: %s build %s\n", gamename, buildstring);
 }
 
 void Host_Say(qboolean teamonly)
 {
 	client_t *save;
-	int j;
-	const char *p1, *p2;
+	int j, quoted;
+	const char *p1;
+	char *p2;
 	// LordHavoc: 256 char say messages
 	unsigned char text[256];
 	qboolean fromServer = false;
@@ -735,43 +795,39 @@ void Host_Say(qboolean teamonly)
 	if (Cmd_Argc () < 2)
 		return;
 
-	save = host_client;
+	if (!teamplay.integer)
+		teamonly = false;
 
 // turn on color set 1
-	if (!fromServer)
-		sprintf (text, "%c%s: ", 1, host_client->name);
-	else
-		sprintf (text, "%c<%s> ", 1, hostname.string);
-
 	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 == '"')
+	quoted = false;
+	if (*p1 == '\"')
 	{
+		quoted = true;
 		p1++;
-		if (p2[-1] == '"')
-			p2--;
-		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'))
+	if (!fromServer)
+		snprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
+	else
+		snprintf (text, sizeof(text), "%c<%s> %s", 1, hostname.string, p1);
+	p2 = text + strlen(text);
+	while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
+	{
+		if (p2[-1] == '\"' && quoted)
+			quoted = false;
+		p2[-1] = 0;
 		p2--;
-	for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
-		text[j++] = *p1++;
-	text[j++] = '\n';
-	text[j++] = 0;
+	}
+	strlcat(text, "\n", sizeof(text));
 
+	// note: save is not a valid edict if fromServer is true
+	save = host_client;
 	for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
-		if (host_client->spawned && (!teamplay.integer || host_client->edict->v->team == save->edict->v->team))
-			SV_ClientPrintf("%s", text);
+		if (host_client->spawned && (!teamonly || host_client->edict->v->team == save->edict->v->team))
+			SV_ClientPrint(text);
 	host_client = save;
 
-	Sys_Printf("%s", &text[1]);
+	Sys_Print(&text[1]);
 }
 
 
@@ -831,9 +887,9 @@ void Host_Tell_f(void)
 		if (p2[-1] == '"')
 			p2--;
 		else if (fromServer)
-			Con_Printf("Host_Tell: missing end quote\n");
+			Con_Print("Host_Tell: missing end quote\n");
 		else
-			SV_ClientPrintf("Host_Tell: missing end quote\n");
+			SV_ClientPrint("Host_Tell: missing end quote\n");
 	}
 	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
 		p2--;
@@ -845,7 +901,7 @@ void Host_Tell_f(void)
 	save = host_client;
 	for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
 		if (host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1)))
-			SV_ClientPrintf("%s", text);
+			SV_ClientPrint(text);
 	host_client = save;
 }
 
@@ -865,8 +921,8 @@ void Host_Color_f(void)
 
 	if (Cmd_Argc() == 1)
 	{
-		Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
-		Con_Printf ("color <0-15> [0-15]\n");
+		Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
+		Con_Print("color <0-15> [0-15]\n");
 		return;
 	}
 
@@ -897,31 +953,58 @@ void Host_Color_f(void)
 		return;
 	}
 
-	if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+	if (host_client->edict && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
 	{
-		Con_DPrintf("Calling SV_ChangeTeam\n");
+		Con_DPrint("Calling SV_ChangeTeam\n");
 		pr_global_struct->time = sv.time;
 		pr_globals[OFS_PARM0] = playercolor;
-		pr_global_struct->self = EDICT_TO_PROG(sv_player);
-		PR_ExecuteProgram (SV_ChangeTeam, "");
+		pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+		PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
 	}
 	else
 	{
 		eval_t *val;
-		if (sv_player)
+		if (host_client->edict)
 		{
-			if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
+			if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
 				val->_float = playercolor;
-			sv_player->v->team = bottom + 1;
+			host_client->edict->v->team = bottom + 1;
 		}
 		host_client->colors = playercolor;
-		host_client->old_colors = playercolor;
+		if (host_client->old_colors != host_client->colors)
+		{
+			host_client->old_colors = host_client->colors;
+			// 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->colors);
+		}
+	}
+}
 
-		// send notification to all clients
-		MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-		MSG_WriteByte (&sv.reliable_datagram, host_client->number);
-		MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"};
+void Host_Rate_f(void)
+{
+	int rate;
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Printf("\"rate\" is \"%i\"\n", cl_rate.integer);
+		Con_Print("rate <500-25000>\n");
+		return;
 	}
+
+	rate = atoi(Cmd_Argv(1));
+
+	if (cmd_source == src_command)
+	{
+		Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
+		if (cls.state == ca_connected)
+			Cmd_ForwardToServer ();
+		return;
+	}
+
+	host_client->rate = rate;
 }
 
 /*
@@ -937,9 +1020,9 @@ void Host_Kill_f (void)
 		return;
 	}
 
-	if (!sv_player || sv_player->v->health <= 0)
+	if (host_client->edict->v->health <= 0)
 	{
-		SV_ClientPrintf ("Can't suicide -- already dead!\n");
+		SV_ClientPrint("Can't suicide -- already dead!\n");
 		return;
 	}
 
@@ -963,14 +1046,14 @@ void Host_Pause_f (void)
 		return;
 	}
 	if (!pausable.integer)
-		SV_ClientPrintf ("Pause not allowed.\n");
+		SV_ClientPrint("Pause not allowed.\n");
 	else
 	{
 		sv.paused ^= 1;
-		SV_BroadcastPrintf ("%s %spaused the game\n", host_client->name, sv.paused ? "" : "un");
+		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);
+		MSG_WriteByte(&sv.reliable_datagram, svc_setpause);
+		MSG_WriteByte(&sv.reliable_datagram, sv.paused);
 	}
 }
 
@@ -988,7 +1071,7 @@ static void Host_PModel_f (void)
 
 	if (Cmd_Argc () == 1)
 	{
-		Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
+		Con_Printf("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
 		return;
 	}
 	i = atoi(Cmd_Argv(1));
@@ -1003,8 +1086,7 @@ static void Host_PModel_f (void)
 		return;
 	}
 
-	host_client->pmodel = i;
-	if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+	if (host_client->edict && (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
 		val->_float = i;
 }
 
@@ -1020,13 +1102,13 @@ void Host_PreSpawn_f (void)
 {
 	if (cmd_source == src_command)
 	{
-		Con_Printf ("prespawn is not valid from the console\n");
+		Con_Print("prespawn is not valid from the console\n");
 		return;
 	}
 
 	if (host_client->spawned)
 	{
-		Con_Printf ("prespawn not valid -- already spawned\n");
+		Con_Print("prespawn not valid -- already spawned\n");
 		return;
 	}
 
@@ -1034,6 +1116,9 @@ void Host_PreSpawn_f (void)
 	MSG_WriteByte (&host_client->message, svc_signonnum);
 	MSG_WriteByte (&host_client->message, 2);
 	host_client->sendsignon = true;
+
+	// reset the name change timer because the client will send name soon
+	host_client->nametime = 0;
 }
 
 /*
@@ -1050,21 +1135,19 @@ void Host_Spawn_f (void)
 
 	if (cmd_source == src_command)
 	{
-		Con_Printf("spawn is not valid from the console\n");
+		Con_Print("spawn is not valid from the console\n");
 		return;
 	}
 
 	if (host_client->spawned)
 	{
-		Con_Printf("Spawn not valid -- already spawned\n");
+		Con_Print("Spawn not valid -- already spawned\n");
 		return;
 	}
 
-	if (!sv_player)
-	{
-		Con_Printf("Host_Spawn: no edict??\n");
-		return;
-	}
+	// reset name change timer again because they might want to change name
+	// again in the first 5 seconds after connecting
+	host_client->nametime = 0;
 
 	// LordHavoc: moved this above the QC calls at FrikaC's request
 	// send all current names, colors, and frag counts
@@ -1080,18 +1163,18 @@ void Host_Spawn_f (void)
 		if ((f = ED_FindFunction ("RestoreGame")))
 		if ((RestoreGame = (func_t)(f - pr_functions)))
 		{
-			Con_DPrintf("Calling RestoreGame\n");
+			Con_DPrint("Calling RestoreGame\n");
 			pr_global_struct->time = sv.time;
-			pr_global_struct->self = EDICT_TO_PROG(sv_player);
-			PR_ExecuteProgram (RestoreGame, "");
+			pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+			PR_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing");
 		}
 	}
 	else
 	{
 		// set up the edict
-		ED_ClearEdict(sv_player);
+		ED_ClearEdict(host_client->edict);
 
-		//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);
+		//Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(host_client->edict->v->netname), host_client->name);
 
 		// copy spawn parms out of the client_t
 		for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
@@ -1099,11 +1182,11 @@ void Host_Spawn_f (void)
 
 		// call the spawn function
 		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->ClientConnect, "QC function ClientConnect is missing");
 
-		if ((Sys_DoubleTime() - host_client->netconnection->connecttime) <= sv.time)
-			Sys_Printf ("%s entered the game\n", host_client->name);
+		if ((Sys_DoubleTime() - host_client->connecttime) <= sv.time)
+			Sys_Printf("%s entered the game\n", host_client->name);
 
 		PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
 	}
@@ -1119,13 +1202,13 @@ void Host_Spawn_f (void)
 			continue;
 		MSG_WriteByte (&host_client->message, svc_updatename);
 		MSG_WriteByte (&host_client->message, i);
-		MSG_WriteString (&host_client->message, client->old_name);
+		MSG_WriteString (&host_client->message, client->name);
 		MSG_WriteByte (&host_client->message, svc_updatefrags);
 		MSG_WriteByte (&host_client->message, i);
-		MSG_WriteShort (&host_client->message, client->old_frags);
+		MSG_WriteShort (&host_client->message, client->frags);
 		MSG_WriteByte (&host_client->message, svc_updatecolors);
 		MSG_WriteByte (&host_client->message, i);
-		MSG_WriteByte (&host_client->message, client->old_colors);
+		MSG_WriteByte (&host_client->message, client->colors);
 	}
 
 	// send all current light styles
@@ -1159,11 +1242,11 @@ void Host_Spawn_f (void)
 	// 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, sv_player->v->angles[i] );
-	MSG_WriteAngle (&host_client->message, 0 );
+	MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[0], sv.protocol);
+	MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[1], sv.protocol);
+	MSG_WriteAngle (&host_client->message, 0, sv.protocol);
 
-	SV_WriteClientdataToMessage (sv_player, &host_client->message);
+	SV_WriteClientdataToMessage (host_client->edict, &host_client->message);
 
 	MSG_WriteByte (&host_client->message, svc_signonnum);
 	MSG_WriteByte (&host_client->message, 3);
@@ -1179,7 +1262,7 @@ void Host_Begin_f (void)
 {
 	if (cmd_source == src_command)
 	{
-		Con_Printf ("begin is not valid from the console\n");
+		Con_Print("begin is not valid from the console\n");
 		return;
 	}
 
@@ -1258,9 +1341,9 @@ void Host_Kick_f (void)
 				message++;
 		}
 		if (message)
-			SV_ClientPrintf ("Kicked by %s: %s\n", who, message);
+			SV_ClientPrintf("Kicked by %s: %s\n", who, message);
 		else
-			SV_ClientPrintf ("Kicked by %s\n", who);
+			SV_ClientPrintf("Kicked by %s\n", who);
 		SV_DropClient (false); // kicked
 	}
 
@@ -1292,12 +1375,9 @@ void Host_Give_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
-		SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+		SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
 		return;
 	}
 
@@ -1322,113 +1402,113 @@ 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;
+					host_client->edict->v->items = (int)host_client->edict->v->items | HIT_PROXIMITY_GUN;
 				else
-					sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER;
+					host_client->edict->v->items = (int)host_client->edict->v->items | IT_GRENADE_LAUNCHER;
 			}
 			else if (t[0] == '9')
-				sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
+				host_client->edict->v->items = (int)host_client->edict->v->items | HIT_LASER_CANNON;
 			else if (t[0] == '0')
-				sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
+				host_client->edict->v->items = (int)host_client->edict->v->items | HIT_MJOLNIR;
 			else if (t[0] >= '2')
-				sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
+				host_client->edict->v->items = (int)host_client->edict->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'));
+				host_client->edict->v->items = (int)host_client->edict->v->items | (IT_SHOTGUN << (t[0] - '2'));
 		}
 		break;
 
 	case 's':
-		if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+		if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1)))
 			val->_float = v;
 
-		sv_player->v->ammo_shells = v;
+		host_client->edict->v->ammo_shells = v;
 		break;
 	case 'n':
 		if (gamemode == GAME_ROGUE)
 		{
-			if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
+			if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1)))
 			{
 				val->_float = v;
-				if (sv_player->v->weapon <= IT_LIGHTNING)
-					sv_player->v->ammo_nails = v;
+				if (host_client->edict->v->weapon <= IT_LIGHTNING)
+					host_client->edict->v->ammo_nails = v;
 			}
 		}
 		else
 		{
-			sv_player->v->ammo_nails = v;
+			host_client->edict->v->ammo_nails = v;
 		}
 		break;
 	case 'l':
 		if (gamemode == GAME_ROGUE)
 		{
-			val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails);
+			val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails);
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v->weapon > IT_LIGHTNING)
-					sv_player->v->ammo_nails = v;
+				if (host_client->edict->v->weapon > IT_LIGHTNING)
+					host_client->edict->v->ammo_nails = v;
 			}
 		}
 		break;
 	case 'r':
 		if (gamemode == GAME_ROGUE)
 		{
-			val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1);
+			val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1);
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v->weapon <= IT_LIGHTNING)
-					sv_player->v->ammo_rockets = v;
+				if (host_client->edict->v->weapon <= IT_LIGHTNING)
+					host_client->edict->v->ammo_rockets = v;
 			}
 		}
 		else
 		{
-			sv_player->v->ammo_rockets = v;
+			host_client->edict->v->ammo_rockets = v;
 		}
 		break;
 	case 'm':
 		if (gamemode == GAME_ROGUE)
 		{
-			val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets);
+			val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets);
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v->weapon > IT_LIGHTNING)
-					sv_player->v->ammo_rockets = v;
+				if (host_client->edict->v->weapon > IT_LIGHTNING)
+					host_client->edict->v->ammo_rockets = v;
 			}
 		}
 		break;
 	case 'h':
-		sv_player->v->health = v;
+		host_client->edict->v->health = v;
 		break;
 	case 'c':
 		if (gamemode == GAME_ROGUE)
 		{
-			val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1);
+			val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1);
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v->weapon <= IT_LIGHTNING)
-					sv_player->v->ammo_cells = v;
+				if (host_client->edict->v->weapon <= IT_LIGHTNING)
+					host_client->edict->v->ammo_cells = v;
 			}
 		}
 		else
 		{
-			sv_player->v->ammo_cells = v;
+			host_client->edict->v->ammo_cells = v;
 		}
 		break;
 	case 'p':
 		if (gamemode == GAME_ROGUE)
 		{
-			val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma);
+			val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma);
 			if (val)
 			{
 				val->_float = v;
-				if (sv_player->v->weapon > IT_LIGHTNING)
-					sv_player->v->ammo_cells = v;
+				if (host_client->edict->v->weapon > IT_LIGHTNING)
+					host_client->edict->v->ammo_cells = v;
 			}
 		}
 		break;
@@ -1446,7 +1526,7 @@ edict_t	*FindViewthing (void)
 		if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
 			return e;
 	}
-	Con_Printf ("No viewthing on map\n");
+	Con_Print("No viewthing on map\n");
 	return NULL;
 }
 
@@ -1467,7 +1547,7 @@ void Host_Viewmodel_f (void)
 	m = Mod_ForName (Cmd_Argv(1), false, true, false);
 	if (!m)
 	{
-		Con_Printf ("Can't load %s\n", Cmd_Argv(1));
+		Con_Printf("Can't load %s\n", Cmd_Argv(1));
 		return;
 	}
 
@@ -1571,24 +1651,15 @@ void Host_Startdemos_f (void)
 	int		i, c;
 
 	if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
-	{
-		if (!sv.active && !sv_spawnmap[0])
-		{
-			if (gamemode == GAME_TRANSFUSION)
-				Cbuf_AddText ("map bb1\n");
-			else
-				Cbuf_AddText ("map start\n");
-		}
 		return;
-	}
 
 	c = Cmd_Argc() - 1;
 	if (c > MAX_DEMOS)
 	{
-		Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS);
+		Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS);
 		c = MAX_DEMOS;
 	}
-	Con_DPrintf ("%i demo(s) in loop\n", c);
+	Con_DPrintf("%i demo(s) in loop\n", c);
 
 	for (i=1 ; i<c+1 ; i++)
 		strlcpy (cls.demos[i-1], Cmd_Argv(i), sizeof (cls.demos[i-1]));
@@ -1636,25 +1707,7 @@ void Host_Stopdemo_f (void)
 	if (!cls.demoplayback)
 		return;
 	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])
-	{
-		allowcheats = sv_cheats.integer != 0;
-		SV_SpawnServer(sv_spawnmap);
-	}
-	sv_loadgame[0] = 0;
-	sv_spawnmap[0] = 0;
-	if (sv.active && cls.state == ca_disconnected)
-		Cbuf_AddText ("connect local");
+	Host_ShutdownServer (false);
 }
 
 static void MaxPlayers_f(void)
@@ -1669,13 +1722,13 @@ static void MaxPlayers_f(void)
 
 	if (sv.active)
 	{
-		Con_Printf("maxplayers can not be changed while a server is running.\n");
+		Con_Print("maxplayers can not be changed while a server is running.\n");
 		return;
 	}
 
 	n = atoi(Cmd_Argv(1));
 	n = bound(1, n, MAX_SCOREBOARD);
-	Con_Printf ("\"maxplayers\" set to \"%u\"\n", n);
+	Con_Printf("\"maxplayers\" set to \"%u\"\n", n);
 
 	if (svs.clients)
 		Mem_Free(svs.clients);
@@ -1743,6 +1796,8 @@ void Host_InitCommands (void)
 	Cmd_AddCommand ("name", Host_Name_f);
 	Cvar_RegisterVariable (&cl_color);
 	Cmd_AddCommand ("color", Host_Color_f);
+	Cvar_RegisterVariable (&cl_rate);
+	Cmd_AddCommand ("rate", Host_Rate_f);
 	if (gamemode == GAME_NEHAHRA)
 	{
 		Cvar_RegisterVariable (&cl_pmodel);