worked around an ATI driver bug with glColor during GL_EXT_compiled_vertex_array...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index ce613001f3e9f066bdc680a70aca4c402eeff878..486e87510eba289cefdbaee0fcf1b9c4890bb54e 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -33,7 +33,7 @@ int cl_traceline_startsupercontents;
 
 float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int hitbmodels, entity_render_t **hitent, int hitsupercontentsmask)
 {
-       float maxfrac;
+       float maxfrac, maxrealfrac;
        int n;
        entity_render_t *ent;
        float tracemins[3], tracemaxs[3];
@@ -44,15 +44,14 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
        if (hitent)
                *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);
        if (normal)
                VectorCopy(trace.plane.normal, normal);
        cl_traceline_startsupercontents = trace.startsupercontents;
        maxfrac = trace.fraction;
+       maxrealfrac = trace.realfraction;
 
        if (hitbmodels && cl_num_brushmodel_entities)
        {
@@ -77,17 +76,16 @@ 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);
 
                        cl_traceline_startsupercontents |= trace.startsupercontents;
-                       if (maxfrac > trace.fraction)
+                       if (maxrealfrac > trace.realfraction)
                        {
                                if (hitent)
                                        *hitent = ent;
                                maxfrac = trace.fraction;
-                               if (impact)
-                                       VectorLerp(start, trace.fraction, end, impact);
+                               maxrealfrac = trace.realfraction;
                                if (normal)
                                {
                                        VectorCopy(trace.plane.normal, tempnormal);
@@ -96,7 +94,9 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                        }
                }
        }
-       if (maxfrac < 0 || maxfrac > 1) Con_Printf("fraction out of bounds %f %s:%d\n", maxfrac, __LINE__, __FILE__);
+       if (maxfrac < 0 || maxfrac > 1) Con_Printf("fraction out of bounds %f %s:%d\n", maxfrac, __FILE__, __LINE__);
+       if (impact)
+               VectorLerp(start, maxfrac, end, impact);
        return maxfrac;
 }