X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=fc3db1b90efc5199bdab0daf471aed4fb2942aa6;hp=463fb7293bd971699ec8ce0fe4d70eac42f15708;hb=cc3473e216fce052672ec4600896124584866e52;hpb=8601d387b0410acd35294759e5e7a0f126deaf62

diff --git a/host_cmd.c b/host_cmd.c
index 463fb729..fc3db1b9 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "sv_demo.h"
+#include "image.h"
 
 int current_skill;
 cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"};
@@ -28,6 +30,7 @@ cvar_t rcon_address = {0, "rcon_address", "", "server address to send rcon comma
 cvar_t team = {CVAR_USERINFO | CVAR_SAVE, "team", "none", "QW team (4 character limit, example: blue)"};
 cvar_t skin = {CVAR_USERINFO | CVAR_SAVE, "skin", "", "QW player skin name (example: base)"};
 cvar_t noaim = {CVAR_USERINFO | CVAR_SAVE, "noaim", "1", "QW option to disable vertical autoaim"};
+cvar_t r_fixtrans_auto = {0, "r_fixtrans_auto", "0", "automatically fixtrans textures (when set to 2, it also saves the fixed versions to a fixtrans directory)"};
 qboolean allowcheats = false;
 
 extern qboolean host_shuttingdown;
@@ -261,6 +264,10 @@ void Host_Map_f (void)
 		return;
 	}
 
+	// GAME_DELUXEQUAKE - clear warpmark (used by QC)
+	if (gamemode == GAME_DELUXEQUAKE)
+		Cvar_Set("warpmark", "");
+
 	cls.demonum = -1;		// stop demo loop in case this fails
 
 	CL_Disconnect ();
@@ -492,7 +499,7 @@ void Host_Savegame_f (void)
 	FS_Printf(f, "%i\n", SAVEGAME_VERSION);
 
 	memset(comment, 0, sizeof(comment));
-	sprintf(comment, "%-21s kills:%3i/%3i", PRVM_GetString(prog->edicts->fields.server->message), (int)prog->globals.server->killed_monsters, (int)prog->globals.server->total_monsters);
+	sprintf(comment, "%-21.21s kills:%3i/%3i", PRVM_GetString(prog->edicts->fields.server->message), (int)prog->globals.server->killed_monsters, (int)prog->globals.server->total_monsters);
 	// convert space to _ to make stdio happy
 	// LordHavoc: convert control characters to _ as well
 	for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
@@ -518,7 +525,10 @@ void Host_Savegame_f (void)
 
 	PRVM_ED_WriteGlobals (f);
 	for (i=0 ; i<prog->num_edicts ; i++)
+	{
+		Con_Printf("edict %d...\n", i);
 		PRVM_ED_Write (f, PRVM_EDICT_NUM(i));
+	}
 
 	SV_VM_End();
 
@@ -558,6 +568,13 @@ void Host_Loadgame_f (void)
 
 	Con_Printf("Loading game from %s...\n", filename);
 
+	// stop playing demos
+	if (cls.demoplayback)
+		CL_Disconnect ();
+
+	// remove menu
+	key_dest = key_game;
+
 	cls.demonum = -1;		// stop demo loop in case this fails
 
 	t = text = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
@@ -568,7 +585,7 @@ void Host_Loadgame_f (void)
 	}
 
 	// version
-	COM_ParseToken_Simple(&t, false);
+	COM_ParseToken_Simple(&t, false, false);
 	version = atoi(com_token);
 	if (version != SAVEGAME_VERSION)
 	{
@@ -578,25 +595,25 @@ void Host_Loadgame_f (void)
 	}
 
 	// description
-	COM_ParseToken_Simple(&t, false);
+	COM_ParseToken_Simple(&t, false, false);
 
 	for (i = 0;i < NUM_SPAWN_PARMS;i++)
 	{
-		COM_ParseToken_Simple(&t, false);
+		COM_ParseToken_Simple(&t, false, false);
 		spawn_parms[i] = atof(com_token);
 	}
 	// skill
-	COM_ParseToken_Simple(&t, false);
+	COM_ParseToken_Simple(&t, false, false);
 // this silliness is so we can load 1.06 save files, which have float skill values
 	current_skill = (int)(atof(com_token) + 0.5);
 	Cvar_SetValue ("skill", (float)current_skill);
 
 	// mapname
-	COM_ParseToken_Simple(&t, false);
+	COM_ParseToken_Simple(&t, false, false);
 	strlcpy (mapname, com_token, sizeof(mapname));
 
 	// time
-	COM_ParseToken_Simple(&t, false);
+	COM_ParseToken_Simple(&t, false, false);
 	time = atof(com_token);
 
 	allowcheats = sv_cheats.integer != 0;
@@ -617,7 +634,7 @@ void Host_Loadgame_f (void)
 	{
 		// light style
 		oldt = t;
-		COM_ParseToken_Simple(&t, false);
+		COM_ParseToken_Simple(&t, false, false);
 		// if this is a 64 lightstyle savegame produced by Quake, stop now
 		// we have to check this because darkplaces saves 256 lightstyle savegames
 		if (com_token[0] == '{')
@@ -635,7 +652,7 @@ void Host_Loadgame_f (void)
 	for(;;)
 	{
 		oldt = t;
-		COM_ParseToken_Simple(&t, false);
+		COM_ParseToken_Simple(&t, false, false);
 		if (com_token[0] == '{')
 		{
 			t = oldt;
@@ -650,10 +667,10 @@ void Host_Loadgame_f (void)
 	for (;;)
 	{
 		start = t;
-		while (COM_ParseToken_Simple(&t, false))
+		while (COM_ParseToken_Simple(&t, false, false))
 			if (!strcmp(com_token, "}"))
 				break;
-		if (!COM_ParseToken_Simple(&start, false))
+		if (!COM_ParseToken_Simple(&start, false, false))
 		{
 			// end of file
 			break;
@@ -753,6 +770,15 @@ void Host_Name_f (void)
 			host_client->name[j++] = host_client->name[i];
 	host_client->name[j] = 0;
 
+	if(host_client->name[0] == 1 || host_client->name[0] == 2)
+	// may interfere with chat area, and will needlessly beep; so let's add a ^7
+	{
+		memmove(host_client->name + 2, host_client->name, sizeof(host_client->name) - 2);
+		host_client->name[sizeof(host_client->name) - 1] = 0;
+		host_client->name[0] = STRING_COLOR_TAG;
+		host_client->name[1] = '0' + STRING_COLOR_DEFAULT;
+	}
+
 	COM_StringLengthNoColors(host_client->name, 0, &valid_colors);
 	if(!valid_colors) // NOTE: this also proves the string is not empty, as "" is a valid colored string
 	{
@@ -808,6 +834,7 @@ void Host_Name_f (void)
 		MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
 		MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
 		MSG_WriteString (&sv.reliable_datagram, host_client->name);
+		SV_WriteNetnameIntoDemo(host_client);
 	}
 }
 
@@ -1403,9 +1430,6 @@ void Host_Spawn_f (void)
 	if (sv.loadgame)
 	{
 		// loaded games are fully initialized already
-		// if this is the last client to be connected, unpause
-		sv.paused = false;
-
 		if (prog->funcoffsets.RestoreGame)
 		{
 			Con_DPrint("Calling RestoreGame\n");
@@ -1428,8 +1452,8 @@ void Host_Spawn_f (void)
 		prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
 		PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
 
-		if (svs.maxclients > 1 || cls.state == ca_dedicated)
-			Con_Printf("%s entered the game\n", host_client->name);
+		if (cls.state == ca_dedicated)
+			Con_Printf("%s connected\n", host_client->name);
 
 		PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
 	}
@@ -1496,7 +1520,6 @@ void Host_Spawn_f (void)
 		MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[0], sv.protocol);
 		MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[1], sv.protocol);
 		MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
-		sv.loadgame = false; // we're basically done with loading now
 	}
 	else
 	{
@@ -1520,6 +1543,20 @@ Host_Begin_f
 void Host_Begin_f (void)
 {
 	host_client->spawned = true;
+
+	// LordHavoc: note: this code also exists in SV_DropClient
+	if (sv.loadgame)
+	{
+		int i;
+		for (i = 0;i < svs.maxclients;i++)
+			if (svs.clients[i].active && !svs.clients[i].spawned)
+				break;
+		if (i == svs.maxclients)
+		{
+			Con_Printf("Loaded game, everyone rejoined - unpausing\n");
+			sv.paused = sv.loadgame = false; // we're basically done with loading now
+		}
+	}
 }
 
 //===========================================================================
@@ -1583,7 +1620,7 @@ void Host_Kick_f (void)
 		if (Cmd_Argc() > 2)
 		{
 			message = Cmd_Args();
-			COM_ParseToken_Simple(&message, false);
+			COM_ParseToken_Simple(&message, false, false);
 			if (byNumber)
 			{
 				message++;							// skip the #
@@ -1787,7 +1824,7 @@ Host_Viewmodel_f
 void Host_Viewmodel_f (void)
 {
 	prvm_edict_t	*e;
-	model_t	*m;
+	dp_model_t	*m;
 
 	if (!sv.active)
 		return;
@@ -1818,7 +1855,7 @@ void Host_Viewframe_f (void)
 {
 	prvm_edict_t	*e;
 	int		f;
-	model_t	*m;
+	dp_model_t	*m;
 
 	if (!sv.active)
 		return;
@@ -1838,7 +1875,7 @@ void Host_Viewframe_f (void)
 }
 
 
-void PrintFrameName (model_t *m, int frame)
+void PrintFrameName (dp_model_t *m, int frame)
 {
 	if (m->animscenes)
 		Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name);
@@ -1854,7 +1891,7 @@ Host_Viewnext_f
 void Host_Viewnext_f (void)
 {
 	prvm_edict_t	*e;
-	model_t	*m;
+	dp_model_t	*m;
 
 	if (!sv.active)
 		return;
@@ -1881,7 +1918,7 @@ Host_Viewprev_f
 void Host_Viewprev_f (void)
 {
 	prvm_edict_t	*e;
-	model_t	*m;
+	dp_model_t	*m;
 
 	if (!sv.active)
 		return;
@@ -1928,7 +1965,7 @@ void Host_Startdemos_f (void)
 		Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS);
 		c = MAX_DEMOS;
 	}
-	Con_Printf("%i demo(s) in loop\n", c);
+	Con_DPrintf("%i demo(s) in loop\n", c);
 
 	for (i=1 ; i<c+1 ; i++)
 		strlcpy (cls.demos[i-1], Cmd_Argv(i), sizeof (cls.demos[i-1]));
@@ -2324,6 +2361,8 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
 	}
 
 	mysocket = NetConn_ChooseClientSocketForAddress(&address);
+	if (!mysocket)
+		mysocket = NetConn_ChooseServerSocketForAddress(&address);
 	if (mysocket)
 		NetConn_Write(mysocket, send, out - send, &address);
 }
@@ -2484,6 +2523,9 @@ void Host_InitCommands (void)
 	Cmd_AddCommand_WithClientCommand ("pings", NULL, Host_Pings_f, "command sent by clients to request updated ping and packetloss of players on scoreboard (originally from QW, but also used on NQ servers)");
 	Cmd_AddCommand ("pingplreport", Host_PingPLReport_f, "command sent by server containing client ping and packet loss values for scoreboard, triggered by pings command from client (not used by QW servers)");
 
+	Cmd_AddCommand ("fixtrans", Image_FixTransparentPixels_f, "change alpha-zero pixels in an image file to sensible values, and write out a new TGA (warning: SLOW)");
+	Cvar_RegisterVariable (&r_fixtrans_auto);
+
 	Cvar_RegisterVariable (&team);
 	Cvar_RegisterVariable (&skin);
 	Cvar_RegisterVariable (&noaim);
@@ -2492,3 +2534,6 @@ void Host_InitCommands (void)
 	Cvar_RegisterVariable(&sv_adminnick);
 }
 
+void Host_NoOperation_f(void)
+{
+}