X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_collision.h;h=532ad2503e3f37b492c28840a7c77b458ade0c71;hp=bf5390af8512ce3058bf8c2d03b4b989ceab79df;hb=d3cbe906d0eedcff735096a08340d8ca90457fa9;hpb=30cf91679a3f0d8de407a01ea6c669c9ae134e70;ds=sidebyside

diff --git a/cl_collision.h b/cl_collision.h
index bf5390af..532ad250 100644
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -2,11 +2,7 @@
 #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_startcontents; // set by TraceLine
-
-float CL_TraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int hitbmodels, int *hitent, int hitsupercontentsmask);
+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);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);
 int CL_PointQ1Contents(const vec3_t p);