Merge branch 'master' into Cloudwalk/protocol_redesign

diff --cc cl_cmd.c
Simple merge

diff --cc cl_main.c
Simple merge

diff --cc client.h
Simple merge

diff --cc sv_main.c
Simple merge

diff --cc sv_send.c
index cc70f475479a3124af4a7d4ce72e094801768c84,984f9635ac4494afe78410e2d937510be2cccde2..e1ae5d34f3c30a5266bcc63bc07c208ca58fb01c
--- 1/sv_send.c
--- 2/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);