don't set qc impulse more than once per packet

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 680269c6f06ac6542bb3b8e630addc99b696994a..985830985448a1ccfe17af159edfe89eec5a8d0b 100644 (file)
--- a/world.c
+++ b/world.c
@@ -417,7 +417,6 @@ trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t
        model_t *model = NULL;
        matrix4x4_t matrix, imatrix;
        float tempnormal[3], starttransformed[3], endtransformed[3];
-       float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
 
        memset(&trace, 0, sizeof(trace));
        trace.fraction = trace.realfraction = 1;
@@ -474,11 +473,7 @@ trace_t SV_ClipMoveToEntity(prvm_edict_t *ent, const vec3_t start, const vec3_t
                int frame;
                frame = (int)ent->fields.server->frame;
                frame = bound(0, frame, (model->numframes - 1));
-               VectorAdd(starttransformed, maxs, starttransformedmaxs);
-               VectorAdd(endtransformed, maxs, endtransformedmaxs);
-               VectorAdd(starttransformed, mins, starttransformedmins);
-               VectorAdd(endtransformed, mins, endtransformedmins);
-               model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
+               model->TraceBox(model, frame, &trace, starttransformed, mins, maxs, endtransformed, hitsupercontents);
        }
        else
                Collision_ClipTrace_Box(&trace, ent->fields.server->mins, ent->fields.server->maxs, starttransformed, mins, maxs, endtransformed, hitsupercontents, SUPERCONTENTS_SOLID);
@@ -506,14 +501,9 @@ SV_ClipMoveToWorld
 trace_t SV_ClipMoveToWorld(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype, int hitsupercontents)
 {
        trace_t trace;
-       float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
        memset(&trace, 0, sizeof(trace));
        trace.fraction = trace.realfraction = 1;
-       VectorAdd(start, maxs, starttransformedmaxs);
-       VectorAdd(end, maxs, endtransformedmaxs);
-       VectorAdd(start, mins, starttransformedmins);
-       VectorAdd(end, mins, endtransformedmins);
-       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, hitsupercontents);
+       sv.worldmodel->TraceBox(sv.worldmodel, 0, &trace, start, mins, maxs, end, hitsupercontents);
        trace.fraction = bound(0, trace.fraction, 1);
        trace.realfraction = bound(0, trace.realfraction, 1);
        VectorLerp(start, trace.fraction, end, trace.endpos);