SV_PointContents removed (all calls replaced with Mod_PointInLeaf, which is faster)

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 1ce1b73ac8bfba1ad996bff41c405d4d4925b75c..31dddb51ebd6a9c5116f9c487065a8a92580785a 100644 (file)
--- a/world.c
+++ b/world.c
@@ -383,20 +383,6 @@ POINT TESTING IN HULLS
 ===============================================================================
 */
 
-/*
-==================
-SV_HullPointContents
-
-==================
-*/
-int SV_HullPointContents (hull_t *hull, int num, vec3_t p)
-{
-       while (num >= 0)
-               num = hull->clipnodes[num].children[(hull->planes[hull->clipnodes[num].planenum].type < 3 ? p[hull->planes[hull->clipnodes[num].planenum].type] : DotProduct (hull->planes[hull->clipnodes[num].planenum].normal, p)) < hull->planes[hull->clipnodes[num].planenum].dist];
-
-       return num;
-}
-
 /*
 ============
 SV_TestEntityPosition
@@ -404,16 +390,9 @@ SV_TestEntityPosition
 This could be a lot more efficient...
 ============
 */
-edict_t        *SV_TestEntityPosition (edict_t *ent)
+int SV_TestEntityPosition (edict_t *ent)
 {
-       trace_t trace;
-
-       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent);
-
-       if (trace.startsolid)
-               return sv.edicts;
-
-       return NULL;
+       return SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, ent->v.origin, MOVE_NORMAL, ent).startsolid;
 }