float tempnormal[3], starttransformed[3], endtransformed[3];
if (hitent)
- *hitent = NULL;
+ *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);
VectorCopy(trace.plane.normal, normal);
cl_traceline_startsupercontents = trace.startsupercontents;
maxfrac = trace.fraction;
- if (hitent && trace.fraction < 1)
- *hitent = &cl_entities[0].render;
if (hitbmodels && cl_num_brushmodel_entities)
{
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);
- if (trace.allsolid || trace.startsolid || maxfrac > trace.fraction)
+ cl_traceline_startsupercontents |= trace.startsupercontents;
+ if (maxfrac > trace.fraction)
{
- cl_traceline_startsupercontents = trace.startsupercontents;
if (hitent)
*hitent = ent;
- if (maxfrac > trace.fraction)
+ maxfrac = trace.fraction;
+ if (impact)
+ VectorLerp(start, trace.fraction, end, impact);
+ if (normal)
{
- maxfrac = trace.fraction;
- if (impact)
- VectorLerp(start, trace.fraction, end, impact);
- if (normal)
- {
- VectorCopy(trace.plane.normal, tempnormal);
- Matrix4x4_Transform3x3(&matrix, tempnormal, normal);
- }
+ VectorCopy(trace.plane.normal, tempnormal);
+ Matrix4x4_Transform3x3(&matrix, tempnormal, normal);
}
}
}