-// 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);
+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);
+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);