X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_collision.h;h=c4052035380be63a06b7b52312fa91dc95fa4a2f;hb=11412bd9b37cead3418715820ef25530b6b2db1e;hp=c7ba402291e86cc71ab551a0e3f2ecb4daae005c;hpb=2fa6c1c686a631ca835285d9f01eddf0dd58de85;p=xonotic%2Fdarkplaces.git

diff --git a/cl_collision.h b/cl_collision.h
index c7ba4022..c4052035 100644
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -2,12 +2,9 @@
 #ifndef CL_COLLISION_H
 #define CL_COLLISION_H
 
-// if contents is not zero, it will impact on content changes
-// (leafs matching contents are considered empty, others are solid)
-extern int cl_traceline_endcontents; // set by TraceLine
-
-float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels, entity_render_t **hitent);
+trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitbmodels, int *hitent, int hitsupercontentsmask, qboolean hitplayers);
+float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent, qboolean csqcents);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);
-int CL_PointContents(const vec3_t p);
+int CL_PointSuperContents(const vec3_t p);
 
 #endif