From: Cloudwalk <cloudwalk009@gmail.com>
Date: Sat, 17 Oct 2020 14:36:52 +0000 (-0400)
Subject: Merge branch 'master' into Cloudwalk/protocol_redesign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4620673157a335f3b06aeb2be61c75f475874cbc;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into Cloudwalk/protocol_redesign
---

4620673157a335f3b06aeb2be61c75f475874cbc
diff --cc sv_send.c
index cc70f475,984f9635..e1ae5d34
--- a/sv_send.c
+++ b/sv_send.c
@@@ -291,7 -291,7 +291,7 @@@ void SV_StartSound (prvm_edict_t *entit
  	}
  	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)
++	if ((field_mask & SND_LARGESOUND) || sv.protocol == &protocol_nehahrabjp2 || sv.protocol == &protocol_nehahrabjp3)
  		MSG_WriteShort (dest, sound_num);
  	else
  		MSG_WriteByte (dest, sound_num);