From: havoc Date: Sat, 23 Jun 2012 04:54:58 +0000 (+0000) Subject: fix for hip1m1 gold key door - favor earlier entity result in cliptrace X-Git-Tag: xonotic-v0.7.0~123 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=fdec98b3acbe202c87a60441a4cd2e17ecd44024;p=xonotic%2Fdarkplaces.git fix for hip1m1 gold key door - favor earlier entity result in cliptrace 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 --- diff --git a/collision.c b/collision.c index af0758f5..264eddb3 100644 --- a/collision.c +++ b/collision.c @@ -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;