undo an edit in r9537 that caused it to be possible to walk through a
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 26 Feb 2010 12:03:37 +0000 (12:03 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 26 Feb 2010 12:03:37 +0000 (12:03 +0000)
narrow gap in toxic in Nexuiz near the rocket launcher

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

collision.c

index 56666af..b2d26e4 100644 (file)
@@ -725,10 +725,6 @@ void Collision_TraceBrushBrushFloat(trace_t *trace, const colbrushf_t *trace_sta
                        VectorCopy(startplane, startdepthnormal);
                }
 
-               if (startdist >= -collision_impactnudge.value && enddist >= startdist)
-                       return;
-               if (startdist <= 0 && enddist <= 0)
-                       continue;
                if (startdist > enddist)
                {
                        // moving into brush
@@ -901,10 +897,6 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
                        VectorCopy(startplane, startdepthnormal);
                }
 
-               if (startdist >= -collision_impactnudge.value && enddist >= startdist)
-                       return;
-               if (startdist <= 0 && enddist <= 0)
-                       continue;
                if (startdist > enddist)
                {
                        // moving into brush