X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_collision.h;h=532ad2503e3f37b492c28840a7c77b458ade0c71;hb=18ccad34785dd40794a2198ac79d05694b2f1a40;hp=ec4a89f05df47f3e17b4448fce88d9b31d55a70b;hpb=1019743b2072b60aa1a2897b04c7cbb8f94454d1;p=xonotic%2Fdarkplaces.git

diff --git a/cl_collision.h b/cl_collision.h
index ec4a89f0..532ad250 100644
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -2,13 +2,10 @@
 #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
-
-// need to call this sometime before using TraceLine with hitbmodels
-void CL_TraceLine_ScanForBModels(void);
-
-float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels);
+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);
+int CL_PointSuperContents(const vec3_t p);
 
 #endif