X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=86668a20a267a3c2dae6c6fb67621d8bbed28102;hp=bdae5cf8227d10202e48b1cf481cc164f8c58f38;hb=9dc8149ee231682452a52a4ec4bdee3981da5492;hpb=435b52972823fa8e8ceb9b67797ca3f886f6208a

diff --git a/host_cmd.c b/host_cmd.c
index bdae5cf8..86668a20 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -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 ();
 }
 
@@ -70,8 +65,8 @@ void Host_Status_f (void)
 	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);
+	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;
@@ -80,16 +75,17 @@ void Host_Status_f (void)
 		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", players, svs.maxclients);
+	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)
 		{
@@ -101,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");
 	}
 }
 
@@ -121,17 +117,14 @@ void Host_God_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	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) )
+	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_ClientPrint("godmode ON\n");
@@ -145,17 +138,14 @@ void Host_Notarget_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	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) )
+	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_ClientPrint("notarget ON\n");
@@ -171,25 +161,22 @@ void Host_Noclip_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	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;
+		host_client->edict->v->movetype = MOVETYPE_NOCLIP;
 		SV_ClientPrint("noclip ON\n");
 	}
 	else
 	{
 		noclip_anglehack = false;
-		sv_player->v->movetype = MOVETYPE_WALK;
+		host_client->edict->v->movetype = MOVETYPE_WALK;
 		SV_ClientPrint("noclip OFF\n");
 	}
 }
@@ -209,23 +196,20 @@ void Host_Fly_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	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;
+		host_client->edict->v->movetype = MOVETYPE_FLY;
 		SV_ClientPrint("flymode ON\n");
 	}
 	else
 	{
-		sv_player->v->movetype = MOVETYPE_WALK;
+		host_client->edict->v->movetype = MOVETYPE_WALK;
 		SV_ClientPrint("flymode OFF\n");
 	}
 }
@@ -283,6 +267,12 @@ 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;
 
@@ -291,8 +281,9 @@ void Host_Map_f (void)
 	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
 	allowcheats = sv_cheats.integer != 0;
@@ -312,7 +303,7 @@ Goes to a new map, taking all clients along
 void Host_Changelevel_f (void)
 {
 	char level[MAX_QPATH];
-	
+
 	if (Cmd_Argc() != 2)
 	{
 		Con_Print("changelevel <levelname> : continue game on a new level\n");
@@ -323,6 +314,13 @@ void Host_Changelevel_f (void)
 		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 ();
 	allowcheats = sv_cheats.integer != 0;
 	strcpy(level, Cmd_Argv(1));
@@ -341,12 +339,24 @@ Restarts the current server for a dead player
 void Host_Restart_f (void)
 {
 	char mapname[MAX_QPATH];
-	
-	if (cls.demoplayback || !sv.active)
-		return;
 
+	if (Cmd_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;
+
+	// remove console or menu
+	key_dest = key_game;
+	key_consoleactive = 0;
+
 	allowcheats = sv_cheats.integer != 0;
 	strcpy(mapname, sv.name);
 	SV_SpawnServer(mapname);
@@ -364,7 +374,16 @@ 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;
+	}
 	cls.signon = 0;		// need new connection messages
 }
 
@@ -377,6 +396,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));
 }
 
@@ -476,7 +500,7 @@ void Host_Savegame_f (void)
 	FS_DefaultExtension (name, ".sav", sizeof (name));
 
 	Con_Printf("Saving game to %s...\n", name);
-	f = FS_Open (name, "w", false);
+	f = FS_Open (name, "wb", false, false);
 	if (!f)
 	{
 		Con_Print("ERROR: couldn't open.\n");
@@ -492,8 +516,7 @@ void Host_Savegame_f (void)
 	FS_Printf(f, "%s\n", sv.name);
 	FS_Printf(f, "%f\n",sv.time);
 
-// write the light styles
-
+	// write the light styles
 	for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
 	{
 		if (sv.lightstyles[i])
@@ -502,13 +525,9 @@ void Host_Savegame_f (void)
 			FS_Print(f,"m\n");
 	}
 
-
 	ED_WriteGlobals (f);
 	for (i=0 ; i<sv.num_edicts ; i++)
-	{
 		ED_Write (f, EDICT_NUM(i));
-		FS_Flush (f);
-	}
 	FS_Close (f);
 	Con_Print("done.\n");
 }
@@ -523,15 +542,14 @@ Host_Loadgame_f
 */
 void Host_Loadgame_f (void)
 {
-	qfile_t *f;
 	char filename[MAX_QPATH];
 	char mapname[MAX_QPATH];
-	float time, tfloat;
-	char buf[32768];
+	float time;
 	const char *start;
-	char *str;
-	int i, r;
+	const char *t;
+	char *text;
 	edict_t *ent;
+	int i;
 	int entnum;
 	int version;
 	float spawn_parms[NUM_SPAWN_PARMS];
@@ -552,45 +570,53 @@ void Host_Loadgame_f (void)
 
 	cls.demonum = -1;		// stop demo loop in case this fails
 
-	f = FS_Open (filename, "r", false);
-	if (!f)
+	t = text = FS_LoadFile (filename, tempmempool, false);
+	if (!text)
 	{
 		Con_Print("ERROR: couldn't open.\n");
 		return;
 	}
 
-	str = FS_Getline (f);
-	sscanf (str, "%i\n", &version);
+	// version
+	COM_ParseToken(&t, false);
+	version = atoi(com_token);
 	if (version != SAVEGAME_VERSION)
 	{
-		FS_Close (f);
+		Mem_Free(text);
 		Con_Printf("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
 		return;
 	}
 
-	SCR_BeginLoadingPlaque ();
+	// description
+	// this is a little hard to parse, as : is a separator in COM_ParseToken,
+	// so use the console parser instead
+	COM_ParseTokenConsole(&t);
 
-	str = FS_Getline (f);
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
 	{
-		str = FS_Getline (f);
-		sscanf (str, "%f\n", &spawn_parms[i]);
+		COM_ParseToken(&t, false);
+		spawn_parms[i] = atof(com_token);
 	}
+	// skill
+	COM_ParseToken(&t, false);
 // this silliness is so we can load 1.06 save files, which have float skill values
-	str = FS_Getline (f);
-	sscanf (str, "%f\n", &tfloat);
-	current_skill = (int)(tfloat + 0.1);
+	current_skill = (int)(atof(com_token) + 0.5);
 	Cvar_SetValue ("skill", (float)current_skill);
 
-	strcpy (mapname, FS_Getline (f));
+	// mapname
+	COM_ParseToken(&t, false);
+	strcpy (mapname, com_token);
 
-	str = FS_Getline (f);
-	sscanf (str, "%f\n",&time);
+	// time
+	COM_ParseToken(&t, false);
+	time = atof(com_token);
 
 	allowcheats = sv_cheats.integer != 0;
+
 	SV_SpawnServer (mapname);
 	if (!sv.active)
 	{
+		Mem_Free(text);
 		Con_Print("Couldn't load map\n");
 		return;
 	}
@@ -601,39 +627,31 @@ void Host_Loadgame_f (void)
 
 	for (i = 0;i < MAX_LIGHTSTYLES;i++)
 	{
-		str = FS_Getline (f);
-		sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
-		strcpy (sv.lightstyles[i], str);
+		// light style
+		COM_ParseToken(&t, false);
+		sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(com_token)+1);
+		strcpy (sv.lightstyles[i], com_token);
 	}
 
 // 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++)
-		{
-			r = FS_Getc (f);
-			if (r == EOF || !r)
+		start = t;
+		while (COM_ParseToken(&t, false))
+			if (!strcmp(com_token, "}"))
 				break;
-			buf[i] = r;
-			if (r == '}')
-			{
-				i++;
-				break;
-			}
-		}
-		if (i == sizeof(buf)-1)
-			Host_Error ("Loadgame buffer overflow");
-		buf[i] = 0;
-		start = buf;
 		if (!COM_ParseToken(&start, false))
 		{
 			// end of file
 			break;
 		}
 		if (strcmp(com_token,"{"))
+		{
+			Mem_Free(text);
 			Host_Error ("First token isn't a brace");
+		}
 
 		if (entnum == -1)
 		{
@@ -644,7 +662,10 @@ void Host_Loadgame_f (void)
 		{
 			// parse an edict
 			if (entnum >= MAX_EDICTS)
+			{
+				Mem_Free(text);
 				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);
@@ -663,8 +684,6 @@ void Host_Loadgame_f (void)
 	sv.num_edicts = entnum;
 	sv.time = time;
 
-	FS_Close (f);
-
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
 		svs.clients[0].spawn_parms[i] = spawn_parms[i];
 
@@ -715,24 +734,146 @@ void Host_Name_f (void)
 		SV_ClientPrintf("You can't change name more than once every 5 seconds!\n");
 		return;
 	}
-	
+
 	host_client->nametime = sv.time + 5;
 
-	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);
+	// 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));
+
+	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_playermodel", newPath);
+		if (cls.state == ca_connected)
+			Cmd_ForwardToServer ();
+		return;
+	}
 
-// send notification to all clients
+	/*
+	if (sv.time < host_client->nametime)
+	{
+		SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
+		return;
+	}
 
-	MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
-	MSG_WriteByte(&sv.reliable_datagram, host_client->number);
-	MSG_WriteString(&sv.reliable_datagram, host_client->name);
+	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)
 {
@@ -742,8 +883,9 @@ void Host_Version_f (void)
 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;
@@ -765,43 +907,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_Print("Host_Say: missing end quote\n");
-		else
-			SV_ClientPrint("Host_Say: missing end quote\n");
 	}
-	while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+	if (!fromServer)
+		dpsnprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
+	else
+		dpsnprintf (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))
+		if (host_client->spawned && (!teamonly || host_client->edict->v->team == save->edict->v->team))
 			SV_ClientPrint(text);
 	host_client = save;
 
-	Sys_Print(&text[1]);
+	//Con_Print(&text[1]);
 }
 
 
@@ -927,30 +1065,32 @@ 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_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;
-
-		// 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);
+		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);
+		}
 	}
 }
 
@@ -976,7 +1116,7 @@ void Host_Rate_f(void)
 		return;
 	}
 
-	host_client->netconnection->rate = rate;
+	host_client->rate = rate;
 }
 
 /*
@@ -992,7 +1132,7 @@ void Host_Kill_f (void)
 		return;
 	}
 
-	if (!sv_player || sv_player->v->health <= 0)
+	if (host_client->edict->v->health <= 0)
 	{
 		SV_ClientPrint("Can't suicide -- already dead!\n");
 		return;
@@ -1058,8 +1198,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;
 }
 
@@ -1089,6 +1228,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;
 }
 
 /*
@@ -1102,6 +1244,7 @@ void Host_Spawn_f (void)
 	client_t *client;
 	func_t RestoreGame;
 	mfunction_t *f;
+	int stats[MAX_CL_STATS];
 
 	if (cmd_source == src_command)
 	{
@@ -1115,12 +1258,8 @@ void Host_Spawn_f (void)
 		return;
 	}
 
-	if (!sv_player)
-	{
-		Con_Print("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
@@ -1139,16 +1278,16 @@ void Host_Spawn_f (void)
 		{
 			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++)
@@ -1156,11 +1295,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)
+			Con_Printf("%s entered the game\n", host_client->name);
 
 		PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
 	}
@@ -1176,13 +1315,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
@@ -1216,20 +1355,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);
-	if (sv.protocol == PROTOCOL_DARKPLACES5)
-	{
-		MSG_WriteAngle16i (&host_client->message, sv_player->v->angles[0]);
-		MSG_WriteAngle16i (&host_client->message, sv_player->v->angles[1]);
-		MSG_WriteAngle16i (&host_client->message, 0);
-	}
-	else
-	{
-		MSG_WriteAngle8i (&host_client->message, sv_player->v->angles[0]);
-		MSG_WriteAngle8i (&host_client->message, sv_player->v->angles[1]);
-		MSG_WriteAngle8i (&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);
@@ -1358,9 +1488,6 @@ void Host_Give_f (void)
 		return;
 	}
 
-	if (!sv_player)
-		return;
-
 	if (!allowcheats)
 	{
 		SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
@@ -1388,113 +1515,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;
@@ -1637,16 +1764,7 @@ void Host_Startdemos_f (void)
 	int		i, c;
 
 	if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
-	{
-		if (!sv.active)
-		{
-			if (gamemode == GAME_TRANSFUSION)
-				Cbuf_AddText ("map bb1\n");
-			else
-				Cbuf_AddText ("map start\n");
-		}
 		return;
-	}
 
 	c = Cmd_Argc() - 1;
 	if (c > MAX_DEMOS)
@@ -1654,7 +1772,7 @@ void Host_Startdemos_f (void)
 		Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS);
 		c = MAX_DEMOS;
 	}
-	Con_DPrintf("%i demo(s) in loop\n", c);
+	Con_Printf("%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]));
@@ -1798,6 +1916,13 @@ void Host_InitCommands (void)
 		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);