added Venim's dpmaster server (now up to 3 masters)

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index c2f2eaaa63b6474514cbaf88b495dcea63b4518a..17e7b4f8d2d35273d19340963d76b61c045ffd92 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -70,9 +70,7 @@ float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t n
                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])
+                       if (!BoxesOverlap(tracemins, tracemaxs, ent->mins, ent->maxs))
                                continue;
 
                        Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
@@ -96,13 +94,15 @@ 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, __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;
 }
 
-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,18 +138,18 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
        // look for embedded bmodels
        for (n = 0;n < MAX_EDICTS;n++)
        {
-               if (!cl_entities[n].state_current.active)
+               if (!cl_entities_active[n])
                        continue;
                ent = &cl_entities[n].render;
+               if (!BoxesOverlap(ent->mins, ent->maxs, tracemins, tracemaxs))
+                       continue;
                if (!ent->model || !ent->model->TraceBox)
                        continue;
-               //if (((ent->model->type != mod_brushq1 && ent->model->type != mod_brushq2 && ent->model->type != mod_brushq3) || ent->alpha < 1) && !(cl_entities[n].state_current.effects & EF_SELECTABLE))
-               //      continue;
-               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])
+               // 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;