replaced CL_PointQ1Contents with longer calls to contents conversion and CL_PointSupe...

changed CL_PointSuperContents to a #define calling SV_Move directly as an optimization

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5772 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/pr_cmds.c b/pr_cmds.c
index 23edb617d31057d66a177123746b7abf3b8fcbc1..cc5c4141acfe57fa39e10ce77e7e1182e7830a16 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -1547,7 +1547,7 @@ PF_pointcontents
 */
 void PF_pointcontents (void)
 {
-       PRVM_G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(PRVM_G_VECTOR(OFS_PARM0));
+       PRVM_G_FLOAT(OFS_RETURN) = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(PRVM_G_VECTOR(OFS_PARM0)));
 }
 
 /*

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 251ecc4fa4c74b0b8f21bc89d3d32e6bcb1bd336..2bb027e5ad326082d352119b478a40c199007379 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -903,7 +903,7 @@ PF_pointcontents
 */
 void PF_pointcontents (void)
 {
-       PRVM_G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(PRVM_G_VECTOR(OFS_PARM0));
+       PRVM_G_FLOAT(OFS_RETURN) = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(PRVM_G_VECTOR(OFS_PARM0)));
 }
 
 /*

diff --git a/world.c b/world.c
index 7468e1357e5dd2902c9285892d9a820ea96ab95c..b367221d5327737c9618acd5b1eeca682aa25ef2 100644 (file)
--- a/world.c
+++ b/world.c
@@ -739,14 +739,4 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 }
 #endif
 
-int SV_PointSuperContents(const vec3_t point)
-{
-       return SV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
-}
-
-int SV_PointQ1Contents(const vec3_t point)
-{
-       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
-}
-
 

diff --git a/world.h b/world.h
index 898926e864d915436ad781b25f16950c0ffd9174..fd79b93ee36412519658bc296ba8c180693c09a1 100644 (file)
--- a/world.h
+++ b/world.h
@@ -61,8 +61,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