X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=sv_main.c;h=3d8ab6d52ffae45fc59fbb22aa0eaace0826b5be;hb=26dc11f58970cc045fa5f079c6aa1187d013888f;hp=3d9e091b8b0d39c1ed06a68754bec74bca52ee1d;hpb=57a27d2996a59e817ceac69facd1627adc4dfae0;p=xonotic%2Fdarkplaces.git

diff --git a/sv_main.c b/sv_main.c
index 3d9e091b..3d8ab6d5 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -714,6 +714,7 @@ void SV_SendServerinfo (client_t *client)
 	MSG_WriteByte (&client->netconnection->message, 1);
 
 	client->spawned = false;		// need prespawn, spawn, etc
+	client->sendsignon = 1;			// send this message, and increment to 2, 2 will be set to 0 by the prespawn command
 
 	// clear movement info until client enters the new level properly
 	memset(&client->cmd, 0, sizeof(client->cmd));
@@ -1391,6 +1392,8 @@ void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t
 	statsf[STAT_MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION] = sv_airaccel_sideways_friction.value;
 	statsf[STAT_MOVEVARS_FRICTION] = sv_friction.value;
 	statsf[STAT_MOVEVARS_WATERFRICTION] = sv_waterfriction.value >= 0 ? sv_waterfriction.value : sv_friction.value;
+	statsf[STAT_FRAGLIMIT] = fraglimit.value;
+	statsf[STAT_TIMELIMIT] = timelimit.value;
 
 	if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
 	{
@@ -1487,12 +1490,12 @@ void SV_WriteClientdataToMessage (client_t *client, prvm_edict_t *ent, sizebuf_t
 		if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
 		{
 			for (i = 0;i < 32;i++)
-				if (stats[STAT_WEAPON] & (1<<i))
+				if (stats[STAT_ACTIVEWEAPON] & (1<<i))
 					break;
 			MSG_WriteByte (msg, i);
 		}
 		else
-			MSG_WriteByte (msg, stats[STAT_WEAPON]);
+			MSG_WriteByte (msg, stats[STAT_ACTIVEWEAPON]);
 		if (bits & SU_VIEWZOOM)
 		{
 			if (sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4)
@@ -1590,8 +1593,8 @@ static void SV_SendClientDatagram (client_t *client)
 		// the client off if they overflow, and quake protocol shows less than
 		// the full entity set if rate limited
 		clientrate = max(NET_MINRATE, client->rate);
-		maxsize = 1400;
-		maxsize2 = 1400;
+		maxsize = 1024;
+		maxsize2 = 1024;
 	}
 	else
 	{
@@ -1620,7 +1623,7 @@ static void SV_SendClientDatagram (client_t *client)
 	if (!NetConn_CanSend(client->netconnection))
 	{
 		// send the datagram
-		//NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol, clientrate);
+		//NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol, clientrate, true);
 		return;
 	}
 	else if (host_client->spawned)
@@ -1681,7 +1684,9 @@ static void SV_SendClientDatagram (client_t *client)
 	}
 
 // send the datagram
-	NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol, clientrate);
+	NetConn_SendUnreliableMessage (client->netconnection, &msg, sv.protocol, clientrate, client->sendsignon == 2);
+	if (client->sendsignon == 1 && !client->netconnection->message.cursize)
+		client->sendsignon = 2; // prevent reliable until client sends prespawn (this is the keepalive phase)
 }
 
 /*
@@ -1714,7 +1719,7 @@ static void SV_UpdateToReliableMessages (void)
 		if (strcmp(host_client->old_name, host_client->name))
 		{
 			if (host_client->spawned)
-				SV_BroadcastPrintf("%s^%i changed name to %s\n", host_client->old_name, STRING_COLOR_DEFAULT, host_client->name);
+				SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name);
 			strlcpy(host_client->old_name, host_client->name, sizeof(host_client->old_name));
 			// send notification to all clients
 			MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
@@ -1945,6 +1950,7 @@ static void SV_Download_f(void)
 
 	host_client->download_expectedposition = 0;
 	host_client->download_started = false;
+	host_client->sendsignon = true; // make sure this message is sent
 
 	// the rest of the download process is handled in SV_SendClientDatagram
 	// and other code dealing with svc_downloaddata and clc_ackdownloaddata
@@ -2640,7 +2646,14 @@ static void SV_VM_Setup(void)
 	prog->numbuiltins = vm_sv_numbuiltins;
 	prog->headercrc = PROGHEADER_CRC;
 	prog->max_edicts = 512;
-	prog->limit_edicts = MAX_EDICTS;
+	if (sv.protocol == PROTOCOL_QUAKE)
+		prog->limit_edicts = 640; // before quake mission pack 1 this was 512
+	else if (sv.protocol == PROTOCOL_QUAKEDP)
+		prog->limit_edicts = 2048; // guessing
+	else if (sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+		prog->limit_edicts = 2048; // guessing!
+	else
+		prog->limit_edicts = MAX_EDICTS;
 	prog->reserved_edicts = svs.maxclients;
 	prog->edictprivate_size = sizeof(edict_engineprivate_t);
 	prog->name = "server";