X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_collision.h;h=5a2e8e11548d11ec1c491b4131d1f51f4235d801;hb=6fb644eee19956bee121e1f2430d2b84067dc056;hp=c4052035380be63a06b7b52312fa91dc95fa4a2f;hpb=159cacf2eb45b3564ca6d917d4b80c1019f03a61;p=xonotic%2Fdarkplaces.git

diff --git a/cl_collision.h b/cl_collision.h
index c4052035..5a2e8e11 100644
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -2,9 +2,18 @@
 #ifndef CL_COLLISION_H
 #define CL_COLLISION_H
 
-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);
+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_PointSuperContents(const vec3_t p);
+
+dp_model_t *CL_GetModelByIndex(int modelindex);
+dp_model_t *CL_GetModelFromEdict(prvm_edict_t *ed);
+
+void CL_LinkEdict(prvm_edict_t *ent);
+int CL_GenericHitSuperContentsMask(const prvm_edict_t *edict);
+trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, float extend, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities);
+trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, float extend, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities, qboolean hitsurfaces);
+trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask, int skipsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities);
+trace_t CL_Cache_TraceLineSurfaces(const vec3_t start, const vec3_t end, int type, int hitsupercontentsmask, int skipsupercontentsmask);
+#define CL_PointSuperContents(point) (CL_TracePoint((point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL, 0, 0, true, false, NULL, false).startsupercontents)
 
 #endif