X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=1e67a8db3c237eb11225cd1198826b3d3a4dfd0f;hp=fc78cee4becd7f515c6352296312da31b086847d;hb=f23d844be5ecdbafac60ded581883e562be1825b;hpb=57252d1b300d96b2353bf9d564b0de281552d2c5

diff --git a/host_cmd.c b/host_cmd.c
index fc78cee4..1e67a8db 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -21,8 +21,8 @@ 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;
 
 mfunction_t *ED_FindFunction (char *name);
 
@@ -32,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 ();
 }
 
@@ -50,8 +45,9 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
+	const char *protocolname;
 	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)
@@ -66,19 +62,30 @@ void Host_Status_f (void)
 	else
 		print = SV_ClientPrintf;
 
+	for (players = 0, j = 0;j < svs.maxclients;j++)
+		if (svs.clients[j].active)
+			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);
+	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;
+		case PROTOCOL_DARKPLACES6: protocolname = "PROTOCOL_DARKPLACES6";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", net_activeconnections, svs.maxclients);
-	for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
+	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)(net_time - client->netconnection->connecttime);
+		seconds = (int)(realtime - client->connecttime);
 		minutes = seconds / 60;
 		if (minutes)
 		{
@@ -90,7 +97,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");
 	}
 }
 
@@ -110,14 +117,17 @@ void Host_God_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!allowcheats)
+	{
+		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)
@@ -128,14 +138,17 @@ void Host_Notarget_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!allowcheats)
+	{
+		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;
@@ -148,20 +161,23 @@ void Host_Noclip_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!allowcheats)
+	{
+		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");
 	}
 }
 
@@ -180,18 +196,21 @@ void Host_Fly_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!allowcheats)
+	{
+		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");
 	}
 }
 
@@ -214,8 +233,8 @@ void Host_Ping_f (void)
 		return;
 	}
 
-	SV_ClientPrintf ("Client ping times:\n");
-	for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+	SV_ClientPrint("Client ping times:\n");
+	for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
 	{
 		if (!client->active)
 			continue;
@@ -223,7 +242,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);
 	}
 }
 
@@ -246,20 +265,33 @@ command from the console.  Active clients are kicked off.
 */
 void Host_Map_f (void)
 {
-	if (cmd_source != src_command)
+	char level[MAX_QPATH];
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("map <levelname> : start a new game (kicks off all players)\n");
 		return;
+	}
 
-	cls.demonum = -1;		// stop demo loop in case this fails
+	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
+	// 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));
+	allowcheats = sv_cheats.integer != 0;
+	strcpy(level, Cmd_Argv(1));
+	SV_SpawnServer(level);
+	if (sv.active && cls.state == ca_disconnected)
+		CL_EstablishConnection("local:1");
 }
 
 /*
@@ -271,18 +303,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));
+	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");
 }
 
 /*
@@ -294,12 +340,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);
+
+	// 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");
 }
 
 /*
@@ -312,7 +377,17 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-	SCR_BeginLoadingPlaque ();
+	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
 }
 
@@ -325,14 +400,12 @@ 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 ();
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
+		return;
+	}
+	CL_EstablishConnection(Cmd_Argv(1));
 }
 
 
@@ -386,74 +459,75 @@ void Host_Savegame_f (void)
 	if (cmd_source != src_command)
 		return;
 
-	if (!sv.active)
+	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;
 	}
 
-	if (svs.maxclients != 1)
+	for (i = 0;i < svs.maxclients;i++)
 	{
-		Con_Printf ("Can't save multiplayer games.\n");
-		return;
+		if (svs.clients[i].active)
+		{
+			if (i > 0)
+			{
+				Con_Print("Can't save multiplayer games.\n");
+				return;
+			}
+			if (svs.clients[i].edict->v->deadflag)
+			{
+				Con_Print("Can't savegame with a dead player\n");
+				return;
+			}
+		}
 	}
 
 	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;
 	}
 
-	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;
-		}
-	}
+	strlcpy (name, Cmd_Argv(1), sizeof (name));
+	FS_DefaultExtension (name, ".sav", sizeof (name));
 
-	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);
+	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->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");
 	}
 
 
@@ -464,7 +538,7 @@ void Host_Savegame_f (void)
 		FS_Flush (f);
 	}
 	FS_Close (f);
-	Con_Printf ("done.\n");
+	Con_Print("done.\n");
 }
 
 
@@ -476,25 +550,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;
-	}
-
-	sprintf (sv_loadgame, "%s/%s", fs_gamedir, 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 filename[MAX_QPATH];
 	char mapname[MAX_QPATH];
 	float time, tfloat;
 	char buf[32768];
@@ -506,12 +564,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;
 	}
 
@@ -520,7 +592,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;
 	}
 
@@ -543,12 +615,11 @@ void Host_PerformLoadGame(char *name)
 	str = FS_Getline (f);
 	sscanf (str, "%f\n",&time);
 
-	CL_Disconnect_f ();
-
+	allowcheats = sv_cheats.integer != 0;
 	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
@@ -566,8 +637,9 @@ void Host_PerformLoadGame(char *name)
 // load the edicts out of the savegame file
 	// -1 is the globals
 	entnum = -1;
-	while (!FS_Eof (f))
+	for (;;)
 	{
+		r = EOF;
 		for (i = 0;i < (int)sizeof(buf) - 1;i++)
 		{
 			r = FS_Getc (f);
@@ -580,11 +652,13 @@ void Host_PerformLoadGame(char *name)
 				break;
 			}
 		}
+		if (r == EOF)
+			break;
 		if (i == sizeof(buf)-1)
 			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 +674,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;
+			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);
 		}
 
@@ -619,13 +697,11 @@ void Host_PerformLoadGame(char *name)
 	FS_Close (f);
 
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
-		svs.clients->spawn_parms[i] = spawn_parms[i];
+		svs.clients[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:1");
 }
 
 //============================================================================
@@ -635,57 +711,193 @@ 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];
+	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;
 	}
 
 	if (Cmd_Argc () == 2)
-		strncpy(newName, Cmd_Argv(1), 15);
+		strlcpy (newName, Cmd_Argv(1), sizeof (newName));
 	else
-		strncpy(newName, Cmd_Args(), 15);
-	newName[15] = 0;
+		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 (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);
+	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;
+
+	// 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);
+	}
+}
+
+/*
+======================
+Host_Playermodel_f
+======================
+*/
+cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", ""}; 
+// the old cl_playermodel in cl_main has been renamed to __cl_playermodel
+void Host_Playermodel_f (void)
+{
+	int i, j;
+	char newPath[sizeof(host_client->playermodel)];
+
+	if (Cmd_Argc () == 1)
+	{
+		Con_Printf("\"playermodel\" is \"%s\"\n", cl_playermodel.string);
+		return;
+	}
+
+	if (Cmd_Argc () == 2)
+		strlcpy (newPath, Cmd_Argv(1), sizeof (newPath));
+	else
+		strlcpy (newPath, Cmd_Args(), sizeof (newPath));
 
-// send notification to all clients
+	for (i = 0, j = 0;newPath[i];i++)
+		if (newPath[i] != '\r' && newPath[i] != '\n')
+			newPath[j++] = newPath[i];
+	newPath[j] = 0;
 
-	MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
-	MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
-	MSG_WriteString (&sv.reliable_datagram, host_client->name);
+	if (cmd_source == src_command)
+	{
+		Cvar_Set ("_cl_playermodel", newPath);
+		if (cls.state == ca_connected)
+			Cmd_ForwardToServer ();
+		return;
+	}
+
+	/*
+	if (sv.time < host_client->nametime)
+	{
+		SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
+		return;
+	}
+	
+	host_client->nametime = sv.time + 5;
+	*/
+
+	// point the string back at updateclient->name to keep it safe
+	strlcpy (host_client->playermodel, newPath, sizeof (host_client->playermodel));
+	if( eval_playermodel )
+		GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PR_SetString(host_client->playermodel);
+	if (strcmp(host_client->old_model, host_client->playermodel))
+	{
+		if (host_client->spawned)
+			SV_BroadcastPrintf("%s changed model to %s\n", host_client->old_model, host_client->playermodel);
+		strcpy(host_client->old_model, host_client->playermodel);
+		/*// send notification to all clients
+		MSG_WriteByte (&sv.reliable_datagram, svc_updatepmodel);
+		MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
+		MSG_WriteString (&sv.reliable_datagram, host_client->playermodel);*/
+	}
 }
 
+/*
+======================
+Host_Playerskin_f
+======================
+*/
+cvar_t cl_playerskin = {CVAR_SAVE, "_cl_playerskin", ""};
+void Host_Playerskin_f (void)
+{
+	int i, j;
+	char newPath[sizeof(host_client->playerskin)];
+
+	if (Cmd_Argc () == 1)
+	{
+		Con_Printf("\"playerskin\" is \"%s\"\n", cl_playerskin.string);
+		return;
+	}
+
+	if (Cmd_Argc () == 2)
+		strlcpy (newPath, Cmd_Argv(1), sizeof (newPath));
+	else
+		strlcpy (newPath, Cmd_Args(), sizeof (newPath));
+
+	for (i = 0, j = 0;newPath[i];i++)
+		if (newPath[i] != '\r' && newPath[i] != '\n')
+			newPath[j++] = newPath[i];
+	newPath[j] = 0;
+
+	if (cmd_source == src_command)
+	{
+		Cvar_Set ("_cl_playerskin", newPath);
+		if (cls.state == ca_connected)
+			Cmd_ForwardToServer ();
+		return;
+	}
+
+	/*
+	if (sv.time < host_client->nametime)
+	{
+		SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
+		return;
+	}
+	
+	host_client->nametime = sv.time + 5;
+	*/
+
+	// point the string back at updateclient->name to keep it safe
+	strlcpy (host_client->playerskin, newPath, sizeof (host_client->playerskin));
+	if( eval_playerskin )
+		GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PR_SetString(host_client->playerskin);
+	if (strcmp(host_client->old_skin, host_client->playerskin))
+	{
+		if (host_client->spawned)
+			SV_BroadcastPrintf("%s changed skin to %s\n", host_client->old_skin, host_client->playerskin);
+		strcpy(host_client->old_skin, host_client->playerskin);
+		/*// send notification to all clients
+		MSG_WriteByte (&sv.reliable_datagram, svc_updatepskin);
+		MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
+		MSG_WriteString (&sv.reliable_datagram, host_client->playerskin);*/
+	}
+}
 
 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 *client;
 	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;
@@ -707,47 +919,39 @@ void Host_Say(qboolean teamonly)
 	if (Cmd_Argc () < 2)
 		return;
 
-// 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;
+	if (!teamplay.integer)
+		teamonly = false;
 
+// turn on color set 1
 	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
-			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 (!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 (!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);
+		if (p2[-1] == '\"' && quoted)
+			quoted = false;
+		p2[-1] = 0;
+		p2--;
 	}
+	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 && (!teamonly || host_client->edict->v->team == save->edict->v->team))
+			SV_ClientPrint(text);
 	host_client = save;
 
-	Sys_Printf("%s", &text[1]);
+	//Con_Print(&text[1]);
 }
 
 
@@ -765,7 +969,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,8 +1010,10 @@ void Host_Tell_f(void)
 		p1++;
 		if (p2[-1] == '"')
 			p2--;
+		else if (fromServer)
+			Con_Print("Host_Tell: missing end quote\n");
 		else
-			Con_Printf("Host_Say: missing end quote\n");
+			SV_ClientPrint("Host_Tell: missing end quote\n");
 	}
 	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
 		p2--;
@@ -818,16 +1023,9 @@ void Host_Tell_f(void)
 	text[j++] = 0;
 
 	save = host_client;
-	for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
-	{
-		if (!client->active || !client->spawned)
-			continue;
-		if (strcasecmp(client->name, Cmd_Argv(1)))
-			continue;
-		host_client = client;
-		SV_ClientPrintf("%s", text);
-		break;
-	}
+	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_ClientPrint(text);
 	host_client = save;
 }
 
@@ -837,6 +1035,7 @@ 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;
@@ -846,8 +1045,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;
 	}
 
@@ -878,24 +1077,58 @@ void Host_Color_f(void)
 		return;
 	}
 
-	if ((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(host_client->edict);
-		PR_ExecuteProgram (SV_ChangeTeam, "");
+		PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
 	}
 	else
 	{
+		eval_t *val;
+		if (host_client->edict)
+		{
+			if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+				val->_float = playercolor;
+			host_client->edict->v->team = bottom + 1;
+		}
 		host_client->colors = playercolor;
-		host_client->edict->v->team = bottom + 1;
+		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 - svs.clients);
-		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;
 }
 
 /*
@@ -911,14 +1144,14 @@ void Host_Kill_f (void)
 		return;
 	}
 
-	if (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;
 	}
 
 	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");
 }
 
@@ -937,24 +1170,48 @@ 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");
+		// send notification to all clients
+		MSG_WriteByte(&sv.reliable_datagram, svc_setpause);
+		MSG_WriteByte(&sv.reliable_datagram, sv.paused);
+	}
+}
 
-		if (sv.paused)
-		{
-			SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname));
-		}
-		else
-		{
-			SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname));
-		}
+/*
+======================
+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;
 
-	// send notification to all clients
-		MSG_WriteByte (&sv.reliable_datagram, svc_setpause);
-		MSG_WriteByte (&sv.reliable_datagram, sv.paused);
+	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;
+	}
+
+	if (host_client->edict && (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
+		val->_float = i;
 }
 
 //===========================================================================
@@ -969,13 +1226,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;
 	}
 
@@ -983,6 +1240,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;
 }
 
 /*
@@ -992,29 +1252,33 @@ Host_Spawn_f
 */
 void Host_Spawn_f (void)
 {
-	int		i;
-	client_t	*client;
-	edict_t	*ent;
+	int i;
+	client_t *client;
 	func_t RestoreGame;
 	mfunction_t *f;
+	int stats[MAX_CL_STATS];
 
 	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;
 	}
 
+	// 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
+	// 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
@@ -1024,61 +1288,55 @@ 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
 	{
-		eval_t *val;
 		// set up the edict
-		ent = host_client->edict;
+		ED_ClearEdict(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 = PR_SetString(host_client->name);
-		if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
-			val->_float = host_client->pmodel;
+		//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++)
 			(&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_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)
+			Con_Printf("%s entered the game\n", host_client->name);
 
 		PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
 	}
 
 
-// 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, client = svs.clients;i < svs.maxclients;i++, client++)
 	{
+		if (!client->active)
+			continue;
 		MSG_WriteByte (&host_client->message, svc_updatename);
 		MSG_WriteByte (&host_client->message, i);
 		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->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 +1344,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,18 +1361,17 @@ 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, 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, host_client->edict, &host_client->message, stats);
 
 	MSG_WriteByte (&host_client->message, svc_signonnum);
 	MSG_WriteByte (&host_client->message, 3);
@@ -1132,7 +1387,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;
 	}
 
@@ -1157,15 +1412,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,16 +1420,13 @@ 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)
-			return;
-		if (!svs.clients[i].active)
+		if (i < 0 || i >= svs.maxclients || !(host_client = 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, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
 		{
 			if (!host_client->active)
 				continue;
@@ -1210,7 +1454,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 #
@@ -1222,10 +1466,10 @@ 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_DropClient (false);
+			SV_ClientPrintf("Kicked by %s\n", who);
+		SV_DropClient (false); // kicked
 	}
 
 	host_client = save;
@@ -1256,8 +1500,11 @@ void Host_Give_f (void)
 		return;
 	}
 
-	if (pr_global_struct->deathmatch)
+	if (!allowcheats)
+	{
+		SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
 		return;
+	}
 
 	t = Cmd_Argv(1);
 	v = atoi (Cmd_Argv(2));
@@ -1280,116 +1527,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)
-		{
-			if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
-				val->_float = v;
-		}
+		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;
@@ -1407,7 +1651,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;
 }
 
@@ -1428,7 +1672,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;
 	}
 
@@ -1531,28 +1775,23 @@ void Host_Startdemos_f (void)
 {
 	int		i, c;
 
-	if (cls.state == ca_dedicated)
-	{
-		if (!sv.active && !sv_spawnmap[0])
-		{
-			if (gamemode == GAME_TRANSFUSION)
-				Cbuf_AddText ("map bb1\n");
-			else
-				Cbuf_AddText ("map start\n");
-		}
+	if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
 		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_Printf ("%i demo(s) in loop\n", c);
+	Con_Printf("%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);
+		strlcpy (cls.demos[i-1], Cmd_Argv(i), sizeof (cls.demos[i-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)
 	{
@@ -1593,22 +1832,37 @@ void Host_Stopdemo_f (void)
 	if (!cls.demoplayback)
 		return;
 	CL_Disconnect ();
+	Host_ShutdownServer (false);
 }
 
-// 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)
+static void MaxPlayers_f(void)
 {
-	if (vid_hidden && cls.state != ca_dedicated)
+	int n;
+
+	if (Cmd_Argc() != 2)
+	{
+		Con_Printf("\"maxplayers\" is \"%u\"\n", svs.maxclients);
 		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;
+	}
+
+	if (sv.active)
+	{
+		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);
+
+	if (svs.clients)
+		Mem_Free(svs.clients);
+	svs.maxclients = n;
+	svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients);
+	if (n == 1)
+		Cvar_Set ("deathmatch", "0");
+	else
+		Cvar_Set ("deathmatch", "1");
 }
 
 //=============================================================================
@@ -1643,17 +1897,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);
@@ -1667,5 +1916,30 @@ 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);
+	Cvar_RegisterVariable (&cl_rate);
+	Cmd_AddCommand ("rate", Host_Rate_f);
+	if (gamemode == GAME_NEHAHRA)
+	{
+		Cvar_RegisterVariable (&cl_pmodel);
+		Cmd_AddCommand ("pmodel", Host_PModel_f);
+	}
+
+	// BLACK: This isnt game specific anymore (it was GAME_NEXUIZ at first)
+	Cvar_RegisterVariable (&cl_playermodel);
+	Cmd_AddCommand ("playermodel", Host_Playermodel_f);
+	Cvar_RegisterVariable (&cl_playerskin);
+	Cmd_AddCommand ("playerskin", Host_Playerskin_f);
+
+	Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
+	Cmd_AddCommand ("spawn", Host_Spawn_f);
+	Cmd_AddCommand ("begin", Host_Begin_f);
+	Cmd_AddCommand ("maxplayers", MaxPlayers_f);
+
+	Cvar_RegisterVariable(&sv_cheats);
 }