X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_send.c;h=a1ee1050ab3cb69b14251c0be1bdc3b7ef165e27;hp=a9aec2b93282d3cf78f90c4fbc2dbc272d52c757;hb=45e243af848a57db51089ede24ff46d4f05d3047;hpb=feb22f39c2c1a481b8c7a2364767b6402d5d94a1

diff --git a/sv_send.c b/sv_send.c
index a9aec2b9..a1ee1050 100644
--- a/sv_send.c
+++ b/sv_send.c
@@ -291,7 +291,7 @@ void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int n
 	}
 	else
 		MSG_WriteShort (dest, (ent<<3) | channel);
-	if ((field_mask & SND_LARGESOUND) || sv.protocol == PROTOCOL_NEHAHRABJP2)
+	if ((field_mask & SND_LARGESOUND) || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
 		MSG_WriteShort (dest, sound_num);
 	else
 		MSG_WriteByte (dest, sound_num);
@@ -709,7 +709,7 @@ static void SV_PrepareEntitiesForSending(void)
 	memset(sv.sendentitiesindex, 0, prog->num_edicts * sizeof(*sv.sendentitiesindex));
 	for (e = 1, ent = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ent = PRVM_NEXT_EDICT(ent))
 	{
-		if (!ent->priv.server->free && SV_PrepareEntityForSending(ent, sv.sendentities + sv.numsendentities, e))
+		if (!ent->free && SV_PrepareEntityForSending(ent, sv.sendentities + sv.numsendentities, e))
 		{
 			sv.sendentitiesindex[e] = sv.sendentities + sv.numsendentities;
 			sv.numsendentities++;
@@ -1006,7 +1006,7 @@ void SV_AddCameraEyes(void)
 	// check line of sight to portal entities and add them to PVS
 	for (e = 1, ed = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ed = PRVM_NEXT_EDICT(ed))
 	{
-		if (!ed->priv.server->free)
+		if (!ed->free)
 		{
 			if(PRVM_serveredictfunction(ed, camera_transform))
 			{
@@ -1651,7 +1651,7 @@ static void SV_UpdateToReliableMessages (void)
 		if (clientcamera > 0)
 		{
 			int oldclientcamera = host_client->clientcamera;
-			if (clientcamera >= prog->max_edicts || PRVM_EDICT_NUM(clientcamera)->priv.required->free)
+			if (clientcamera >= prog->max_edicts || PRVM_EDICT_NUM(clientcamera)->free)
 				clientcamera = PRVM_NUM_FOR_EDICT(host_client->edict);
 			host_client->clientcamera = clientcamera;
 
@@ -1712,7 +1712,7 @@ void SV_SendClientMessages(void)
 
 		if (host_client->netconnection->message.overflowed)
 		{
-			SV_DropClient (true);	// if the message couldn't send, kick off
+			SV_DropClient (true, "Buffer overflow in net message");	// if the message couldn't send, kick off
 			continue;
 		}