WIN32_LEAN_AND_MEAN patch from Willis to speed up MSVC compilation

[xonotic/darkplaces.git] / cl_collision.h

diff --git a/cl_collision.h b/cl_collision.h
index 568a81fbfbd9a4f6194d84f9d554db9d0078cd76..a01940896251276cf81e9c6c61e8187195c33d6b 100644 (file)
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -2,12 +2,8 @@
 #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, entity_render_t **hitent, int hitsupercontentsmask);
-float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent);
+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_PointQ1Contents(const vec3_t p);
 int CL_PointSuperContents(const vec3_t p);