}
}
}
- 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;
// 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;
-
Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
}
}
}
- 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;