Revert "cmd: Merge cmd_server and cmd_client into cmd_local again"

[xonotic/darkplaces.git] / sv_send.c

diff --git a/sv_send.c b/sv_send.c
index d0205f9835dab5dd36a0f91589b24f475ce2ae87..984f9635ac4494afe78410e2d937510be2cccde2 100644 (file)
--- 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);
@@ -402,7 +402,7 @@ static qbool SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs,
        float f;
        prvm_vec_t *v;
        vec3_t cullmins, cullmaxs;
-       dp_model_t *model;
+       model_t *model;
 
        // fast path for games that do not use legacy entity networking
        // note: still networks clients even if they are legacy
@@ -733,7 +733,7 @@ qbool SV_CanSeeBox(int numtraces, vec_t eyejitter, vec_t enlarge, vec_t entboxex
        int numtouchedicts = 0;
        int touchindex;
        matrix4x4_t matrix, imatrix;
-       dp_model_t *model;
+       model_t *model;
        prvm_edict_t *touch;
        static prvm_edict_t *touchedicts[MAX_EDICTS];
        vec3_t eyemins, eyemaxs, start;
@@ -863,7 +863,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s)
 {
        prvm_prog_t *prog = SVVM_prog;
        int isbmodel;
-       dp_model_t *model;
+       model_t *model;
        prvm_edict_t *ed;
        if (sv.sententitiesconsideration[s->number] == sv.sententitiesmark)
                return;