From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 28 Dec 2003 02:08:10 +0000 (+0000)
Subject: fix a thinko on clip.trace.ent = sv.edicts (it should only be set if startsolid or... 
X-Git-Tag: xonotic-v0.1.0preview~6187
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=59da04aacea8c3898844b6f3ada1fcbda3ccf780;p=xonotic%2Fdarkplaces.git

fix a thinko on clip.trace.ent = sv.edicts (it should only be set if startsolid or fraction < 1)


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

diff --git a/world.c b/world.c
index a8885886..b337fe2e 100644
--- a/world.c
+++ b/world.c
@@ -636,7 +636,8 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 
 	// clip to world
 	clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.mins, clip.maxs, clip.end, clip.type);
-	clip.trace.ent = sv.edicts;
+	if (clip.trace.startsolid || clip.trace.fraction < 1)
+		clip.trace.ent = sv.edicts;
 	if (clip.type == MOVE_WORLDONLY)
 		return clip.trace;