changed cl_brushmodel_entities array from entity_render_t * to int, to fix a crash...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index ef7bce39d1e579757e3be07f2f56a2a3ec809d3a..d014ca360ab6944248ac86a8552a4bd541369e51 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -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);
@@ -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);