From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 26 Feb 2010 12:03:37 +0000 (+0000)
Subject: undo an edit in r9537 that caused it to be possible to walk through a
X-Git-Tag: xonotic-v0.1.0preview~230^2~460
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa8c2da3b1ce02a796fafd6fc91f7a7f50d1fb5e;p=xonotic%2Fdarkplaces.git

undo an edit in r9537 that caused it to be possible to walk through a
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
---

diff --git a/collision.c b/collision.c
index 56666afd..b2d26e4c 100644
--- a/collision.c
+++ b/collision.c
@@ -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