disable USE_WSPIAPI_H by default, since it only works with -DSUPPORTIPV6

[xonotic/darkplaces.git] / collision.c

diff --git a/collision.c b/collision.c
index 56666afdf5532da0131f46c899a4cf3bcbfc2c01..b628262773e040f2738ee06123f3696a2bc1900b 100644 (file)
--- 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)