X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_collision.h;h=568a81fbfbd9a4f6194d84f9d554db9d0078cd76;hb=0940eea12b263ccb0215b9b56cb3611fabc19629;hp=c7ba402291e86cc71ab551a0e3f2ecb4daae005c;hpb=2fa6c1c686a631ca835285d9f01eddf0dd58de85;p=xonotic%2Fdarkplaces.git diff --git a/cl_collision.h b/cl_collision.h index c7ba4022..568a81fb 100644 --- a/cl_collision.h +++ b/cl_collision.h @@ -4,10 +4,12 @@ // 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 +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 contents, int hitbmodels, entity_render_t **hitent); +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); void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius); -int CL_PointContents(const vec3_t p); +int CL_PointQ1Contents(const vec3_t p); +int CL_PointSuperContents(const vec3_t p); #endif