Changed the collision code used by sv_gameplayfix_nudgeoutofsolid to not consider...

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

diff --git a/collision.c b/collision.c
index 11e4a865bfecbe8494a74ae51cf03ab4e261a1da..2c4cec651844ad87d23684490f826dc951ee9d38 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -649,7 +649,7 @@ void Collision_TraceBrushBrushFloat(trace_t *trace, const colbrushf_t *trace_sta
                //Con_Printf("%c%i: startdist = %f, enddist = %f, startdist / (startdist - enddist) = %f\n", nplane2 != nplane ? 'b' : 'a', nplane2, startdist, enddist, startdist / (startdist - enddist));
 
                // aside from collisions, this is also used for error correction
-               if (startdist <= collision_impactnudge.value && nplane < numplanes1 && (startdepth < startdist || startdepth == 1))
+               if (startdist <= 0.0f && nplane < numplanes1 && (startdepth < startdist || startdepth == 1))
                {
                        startdepth = startdist;
                        VectorCopy(startplane, startdepthnormal);
@@ -814,7 +814,7 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
                //Con_Printf("%c%i: startdist = %f, enddist = %f, startdist / (startdist - enddist) = %f\n", nplane2 != nplane ? 'b' : 'a', nplane2, startdist, enddist, startdist / (startdist - enddist));
 
                // aside from collisions, this is also used for error correction
-               if (startdist < collision_impactnudge.value && (startdepth < startdist || startdepth == 1))
+               if (startdist <= 0.0f && (startdepth < startdist || startdepth == 1))
                {
                        startdepth = startdist;
                        VectorCopy(startplane, startdepthnormal);