added DP_QC_TRACE_MOVETYPE_HITMODEL extension (and added DP_QC_TRACE_MOVETYPE_WORLDON...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 657a0ff44496149f39ddde6b7850342476d9d431..3a842bc8a4b5d9290ff6866c962d3e681ed6b40e 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -42,10 +42,10 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
        float tempnormal[3], starttransformed[3], endtransformed[3];
 
        if (hitent)
-               *hitent = NULL;
+               *hitent = &cl_entities[0].render;
        Mod_CheckLoaded(cl.worldmodel);
-       if (cl.worldmodel && cl.worldmodel->brush.TraceBox)
-               cl.worldmodel->brush.TraceBox(cl.worldmodel, &trace, start, start, end, end, hitsupercontentsmask);
+       if (cl.worldmodel && cl.worldmodel->TraceBox)
+               cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, start, end, end, hitsupercontentsmask);
 
        if (impact)
                VectorLerp(start, trace.fraction, end, impact);
@@ -53,8 +53,6 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                VectorCopy(trace.plane.normal, normal);
        cl_traceline_startsupercontents = trace.startsupercontents;
        maxfrac = trace.fraction;
-       if (hitent && trace.fraction < 1)
-               *hitent = &cl_entities[0].render;
 
        if (hitbmodels && cl_num_brushmodel_entities)
        {
@@ -79,24 +77,21 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                        Matrix4x4_Transform(&imatrix, start, starttransformed);
                        Matrix4x4_Transform(&imatrix, end, endtransformed);
 
-                       if (ent->model && ent->model->brush.TraceBox)
-                               ent->model->brush.TraceBox(ent->model, &trace, starttransformed, starttransformed, endtransformed, endtransformed, hitsupercontentsmask);
+                       if (ent->model && ent->model->TraceBox)
+                               ent->model->TraceBox(ent->model, 0, &trace, starttransformed, starttransformed, endtransformed, endtransformed, hitsupercontentsmask);
 
-                       if (trace.allsolid || trace.startsolid || maxfrac > trace.fraction)
+                       cl_traceline_startsupercontents |= trace.startsupercontents;
+                       if (maxfrac > trace.fraction)
                        {
-                               cl_traceline_startsupercontents = trace.startsupercontents;
                                if (hitent)
                                        *hitent = ent;
-                               if (maxfrac > trace.fraction)
+                               maxfrac = trace.fraction;
+                               if (impact)
+                                       VectorLerp(start, trace.fraction, end, impact);
+                               if (normal)
                                {
-                                       maxfrac = trace.fraction;
-                                       if (impact)
-                                               VectorLerp(start, trace.fraction, end, impact);
-                                       if (normal)
-                                       {
-                                               VectorCopy(trace.plane.normal, tempnormal);
-                                               Matrix4x4_Transform3x3(&matrix, tempnormal, normal);
-                                       }
+                                       VectorCopy(trace.plane.normal, tempnormal);
+                                       Matrix4x4_Transform3x3(&matrix, tempnormal, normal);
                                }
                        }
                }