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 10e2d70ed612d2f7f9c6386a5098595a1328cce9..b628262773e040f2738ee06123f3696a2bc1900b 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -18,6 +18,7 @@ cvar_t collision_prefernudgedfraction = {0, "collision_prefernudgedfraction", "1
 #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
 cvar_t collision_endposnudge = {0, "collision_endposnudge", "0", "workaround to fix trace_endpos sometimes being returned where it would be inside solid by making that collision hit (recommended: values like 1)"};
 #endif
+cvar_t collision_debug_tracelineasbox = {0, "collision_debug_tracelineasbox", "0", "workaround for any bugs in Collision_TraceLineBrushFloat by using Collision_TraceBrushBrushFloat"};
 
 void Collision_Init (void)
 {
@@ -30,6 +31,7 @@ void Collision_Init (void)
 #ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
        Cvar_RegisterVariable(&collision_endposnudge);
 #endif
+       Cvar_RegisterVariable(&collision_debug_tracelineasbox);
 }
 
 
@@ -723,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
@@ -860,6 +858,15 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
        vec_t startdepth = 1;
        vec3_t startdepthnormal;
 
+       if (collision_debug_tracelineasbox.integer)
+       {
+               colboxbrushf_t thisbrush_start, thisbrush_end;
+               Collision_BrushForBox(&thisbrush_start, linestart, linestart, 0, 0, NULL);
+               Collision_BrushForBox(&thisbrush_end, lineend, lineend, 0, 0, NULL);
+               Collision_TraceBrushBrushFloat(trace, &thisbrush_start.brush, &thisbrush_end.brush, other_start, other_end);
+               return;
+       }
+
        VectorClear(startdepthnormal);
        Vector4Clear(newimpactplane);
 
@@ -890,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
@@ -1235,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)