SV_Move (and children) now only set trace.ent if there is an impact, not if it was...

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

diff --git a/world.c b/world.c
index 78c3af3bade27d294441fe99ae243f52a12eebf6..338de3ddfef538d87b5f1686a8269df4851bbfe2 100644 (file)
--- a/world.c
+++ b/world.c
@@ -581,8 +581,8 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
                if (trace.startsolid)
                {
                        clip->trace.startsolid = true;
-                       if (!clip->trace.ent)
-                               clip->trace.ent = trace.ent;
+                       //if (!clip->trace.ent)
+                       //      clip->trace.ent = trace.ent;
                }
                if (trace.inopen)
                        clip->trace.inopen = true;
@@ -596,8 +596,8 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
                        clip->trace.ent = touch;
                }
                clip->trace.startsupercontents |= trace.startsupercontents;
-               if (clip->trace.allsolid)
-                       return;
+               //if (clip->trace.allsolid)
+               //      return;
        }
 }
 
@@ -690,25 +690,14 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        return clip.trace;
 }
 
-int SV_PointQ1Contents(const vec3_t point)
+int SV_PointSuperContents(const vec3_t point)
 {
-#if 1
-       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents);
-#else
-       if (sv.worldmodel && sv.worldmodel->brush.PointContents)
-               return sv.worldmodel->brush.PointContents(sv.worldmodel, point);
-       return CONTENTS_SOLID;
-#endif
+       return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
 }
 
-int SV_PointSuperContents(const vec3_t point)
+int SV_PointQ1Contents(const vec3_t point)
 {
-#if 1
-       return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
-#else
-       if (sv.worldmodel && sv.worldmodel->brush.PointContents)
-               return sv.worldmodel->brush.PointContents(sv.worldmodel, point);
-       return CONTENTS_SOLID;
-#endif
+       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
 }
 
+