X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=collision.h;h=ee4e156416b9ced08107c87ac0abc6bb0cb67551;hp=f67c81d1c0dc5a6a809eed676cec6f884e6283da;hb=c4e92b9982882076e7b35e55fb43bd1a0dbd340d;hpb=4d1f179f3ee23adbcc112e4b0e20d093b5c7060b diff --git a/collision.h b/collision.h index f67c81d1..ee4e1564 100644 --- a/collision.h +++ b/collision.h @@ -130,9 +130,9 @@ void Collision_TraceLineTriangleFloat(trace_t *trace, const vec3_t linestart, co // entities, only colliding with SOLID_BSP entities (doors, lifts) // // passedict is excluded from clipping checks -void Collision_ClipToGenericEntity(trace_t *trace, model_t *model, int frame, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask); +void Collision_ClipToGenericEntity(trace_t *trace, dp_model_t *model, int frame, const vec3_t bodymins, const vec3_t bodymaxs, int bodysupercontents, matrix4x4_t *matrix, matrix4x4_t *inversematrix, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask); // like above but does not do a transform and does nothing if model is NULL -void Collision_ClipToWorld(trace_t *trace, model_t *model, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontents); +void Collision_ClipToWorld(trace_t *trace, dp_model_t *model, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontents); // combines data from two traces: // merges contents flags, startsolid, allsolid, inwater // updates fraction, endpos, plane and surface info if new fraction is shorter