X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=4d2b93b6eb76617231bf405b14151e017e68a1fa;hb=5aefe7c200a0278927239cdd4eb56391a66056f1;hp=b8c493b27f68cc455b71530488aa5da731cdf4d0;hpb=6fec031c43332c784db51efa5a98061a230ecc9b;p=xonotic%2Fdarkplaces.git

diff --git a/host_cmd.c b/host_cmd.c
index b8c493b2..4d2b93b6 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -945,7 +945,7 @@ static void Host_Loadgame_f (void)
 			while (entnum >= prog->max_edicts)
 				PRVM_MEM_IncreaseEdicts(prog);
 			ent = PRVM_EDICT_NUM(entnum);
-			memset(ent->fields.vp, 0, prog->entityfields * 4);
+			memset(ent->fields.fp, 0, prog->entityfields * sizeof(prvm_vec_t));
 			ent->priv.server->free = false;
 
 			if(developer_entityparsing.integer)
@@ -1579,7 +1579,7 @@ static void Host_Color(int changetop, int changebottom)
 	if (host_client->edict && PRVM_serverfunction(SV_ChangeTeam))
 	{
 		Con_DPrint("Calling SV_ChangeTeam\n");
-		prog->globals.generic[OFS_PARM0] = playercolor;
+		prog->globals.fp[OFS_PARM0] = playercolor;
 		PRVM_serverglobalfloat(time) = sv.time;
 		PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
 		prog->ExecuteProgram(prog, PRVM_serverfunction(SV_ChangeTeam), "QC function SV_ChangeTeam is missing");
@@ -1698,16 +1698,37 @@ Host_Pause_f
 */
 static void Host_Pause_f (void)
 {
-	if (!pausable.integer)
-		SV_ClientPrint("Pause not allowed.\n");
+	void (*print) (const char *fmt, ...);
+	if (cmd_source == src_command)
+	{
+		// if running a client, try to send over network so the pause is handled by the server
+		if (cls.state == ca_connected)
+		{
+			Cmd_ForwardToServer ();
+			return;
+		}
+		print = Con_Printf;
+	}
 	else
+		print = SV_ClientPrintf;
+
+	if (!pausable.integer)
 	{
-		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 (cmd_source == src_client)
+		{
+			if(cls.state == ca_dedicated || host_client != &svs.clients[0]) // non-admin
+			{
+				print("Pause not allowed.\n");
+				return;
+			}
+		}
 	}
+	
+	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);
 }
 
 /*
@@ -2905,7 +2926,7 @@ void Host_InitCommands (void)
 	Cmd_AddCommand_WithClientCommand ("say_team", Host_Say_Team_f, Host_Say_Team_f, "send a chat message to your team on the server");
 	Cmd_AddCommand_WithClientCommand ("tell", Host_Tell_f, Host_Tell_f, "send a chat message to only one person on the server");
 	Cmd_AddCommand_WithClientCommand ("kill", NULL, Host_Kill_f, "die instantly");
-	Cmd_AddCommand_WithClientCommand ("pause", NULL, Host_Pause_f, "pause the game (if the server allows pausing)");
+	Cmd_AddCommand_WithClientCommand ("pause", Host_Pause_f, Host_Pause_f, "pause the game (if the server allows pausing)");
 	Cmd_AddCommand ("kick", Host_Kick_f, "kick a player off the server by number or name");
 	Cmd_AddCommand_WithClientCommand ("ping", Host_Ping_f, Host_Ping_f, "print ping times of all players on the server");
 	Cmd_AddCommand ("load", Host_Loadgame_f, "load a saved game file");