From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 25 Feb 2009 14:09:34 +0000 (+0000)
Subject: never prefer an entity trace over a world trace if the trace fraction is 1 (not hit).
X-Git-Tag: xonotic-v0.1.0preview~1837
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0cdfcbf61a0d6bace2dfb4384e9555eecdf2cdd5;p=xonotic%2Fdarkplaces.git

never prefer an entity trace over a world trace if the trace fraction is 1 (not hit).
Fixes bug with SOLID_BSP entities sometimes being collided against "as box".


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

diff --git a/collision.c b/collision.c
index c993a668..b9399d6a 100644
--- a/collision.c
+++ b/collision.c
@@ -1541,7 +1541,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)
+	if ((trace->realfraction <= cliptrace->realfraction) && (trace->realfraction != 1))
 	{
 		cliptrace->fraction = trace->fraction;
 		cliptrace->realfraction = trace->realfraction;