renamed r_shadow_cursor cvars to actually have the word cursor in their name like...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 5e59158fa4a3dc03b207f54bbe0354c633ad3461..41734b307bc741c14d1ad3b18c560fdacb001e76 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -31,7 +31,7 @@ physentity_t;
 
 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 CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int hitbmodels, int *hitent, int hitsupercontentsmask)
 {
        float maxfrac, maxrealfrac;
        int n;
@@ -46,7 +46,7 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
        VectorCopy (end, trace.endpos);
 
        if (hitent)
-               *hitent = &cl_entities[0].render;
+               *hitent = 0;
        Mod_CheckLoaded(cl.worldmodel);
        if (cl.worldmodel && cl.worldmodel->TraceBox)
                cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, start, end, end, hitsupercontentsmask);
@@ -69,10 +69,8 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                // look for embedded bmodels
                for (n = 0;n < cl_num_brushmodel_entities;n++)
                {
-                       ent = cl_brushmodel_entities[n];
-                       if (ent->mins[0] > tracemaxs[0] || ent->maxs[0] < tracemins[0]
-                        || ent->mins[1] > tracemaxs[1] || ent->maxs[1] < tracemins[1]
-                        || ent->mins[2] > tracemaxs[2] || ent->maxs[2] < tracemins[2])
+                       ent = &cl_entities[cl_brushmodel_entities[n]].render;
+                       if (!BoxesOverlap(tracemins, tracemaxs, ent->mins, ent->maxs))
                                continue;
 
                        Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
@@ -85,7 +83,7 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                        if (maxrealfrac > trace.realfraction)
                        {
                                if (hitent)
-                                       *hitent = ent;
+                                       *hitent = cl_brushmodel_entities[n];
                                maxfrac = trace.fraction;
                                maxrealfrac = trace.realfraction;
                                if (normal)
@@ -104,7 +102,7 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
        return maxfrac;
 }
 
-float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent)
+float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent)
 {
        float maxfrac, maxrealfrac;
        int n;
@@ -138,7 +136,7 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
        tracemaxs[2] = max(start[2], end[2]);
 
        // look for embedded bmodels
-       for (n = 0;n < MAX_EDICTS;n++)
+       for (n = 0;n < cl_num_entities;n++)
        {
                if (!cl_entities_active[n])
                        continue;
@@ -150,6 +148,8 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
                // if transparent and not selectable, skip entity
                if (!(cl_entities[n].state_current.effects & EF_SELECTABLE) && (ent->alpha < 1 || (ent->effects & (EF_ADDITIVE | EF_NODEPTHTEST))))
                        continue;
+               if (ent == ignoreent)
+                       continue;
                Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
                Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
 
@@ -170,7 +170,9 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
                        }
                }
        }
-       if (maxfrac < 0 || maxfrac > 1) Con_Printf("fraction out of bounds %f %s:%d\n", maxfrac, __FILE__, __LINE__);
+       maxfrac = bound(0, maxfrac, 1);
+       maxrealfrac = bound(0, maxrealfrac, 1);
+       //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;