X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=collision.c;h=b628262773e040f2738ee06123f3696a2bc1900b;hb=c3edd749ac26c6322eafa8303e592df3c32ffd25;hp=56666afdf5532da0131f46c899a4cf3bcbfc2c01;hpb=af7e237a4e6bdaab9a340a61a76ea314dff5624a;p=xonotic%2Fdarkplaces.git

diff --git a/collision.c b/collision.c
index 56666afd..b6282627 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
@@ -1246,7 +1238,7 @@ void Collision_BrushForBox(colboxbrushf_t *boxbrush, const vec3_t mins, const ve
 	boxbrush->brush.texture = texture;
 	VectorSet(boxbrush->brush.mins, mins[0] - 1, mins[1] - 1, mins[2] - 1);
 	VectorSet(boxbrush->brush.maxs, maxs[0] + 1, maxs[1] + 1, maxs[2] + 1);
-	Collision_ValidateBrush(&boxbrush->brush);
+	//Collision_ValidateBrush(&boxbrush->brush);
 }
 
 void Collision_ClipTrace_BrushBox(trace_t *trace, const vec3_t cmins, const vec3_t cmaxs, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitsupercontentsmask, int supercontents, int q3surfaceflags, texture_t *texture)