]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix for hip1m1 gold key door - favor earlier entity result in cliptrace
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 23 Jun 2012 04:54:58 +0000 (04:54 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 23 Jul 2012 15:28:07 +0000 (17:28 +0200)
combining (use of < operator preferred over <=)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11831 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=5ebf3244c7061d4da4ad49d4cd913ed625de8ed6

collision.c

index af0758f50fb196d5c9914ba9402b43fde49c933e..264eddb348975e6871d2fe5b0277eb5a192270d7 100644 (file)
@@ -1954,7 +1954,7 @@ void Collision_CombineTraces(trace_t *cliptrace, const trace_t *trace, void *tou
        //      cliptrace->inopen = true;
        if (trace->inwater)
                cliptrace->inwater = true;
-       if ((trace->realfraction <= cliptrace->realfraction) && (VectorLength2(trace->plane.normal) > 0))
+       if ((trace->realfraction < cliptrace->realfraction) && (VectorLength2(trace->plane.normal) > 0))
        {
                cliptrace->fraction = trace->fraction;
                cliptrace->realfraction = trace->realfraction;