split up net_slist into net_slist and net_slistqw, and modified menu accordingly...

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 898926e864d915436ad781b25f16950c0ffd9174..e01b831c0ca8b00f89c26b2ee484ba9bc7ed1f22 100644 (file)
--- a/world.h
+++ b/world.h
@@ -43,9 +43,6 @@ void SV_UnlinkEdict (prvm_edict_t *ent);
 // if touchtriggers, calls prog functions for the intersected triggers
 void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers);
 
-// returns true if the entity is in solid currently
-int SV_TestEntityPosition (prvm_edict_t *ent);
-
 // returns list of entities touching a box
 int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list);
 
@@ -61,8 +58,7 @@ int SV_EntitiesInBox(vec3_t mins, vec3_t maxs, int maxlist, prvm_edict_t **list)
 // passedict is explicitly excluded from clipping checks (normally NULL)
 trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict);
 
-int SV_PointQ1Contents(const vec3_t point);
-int SV_PointSuperContents(const vec3_t point);
+#define SV_PointSuperContents(point) (SV_Move((point), vec3_origin, vec3_origin, (point), sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents)
 
 #endif