From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 3 May 2002 22:07:16 +0000 (+0000)
Subject: reverted embedded-in-other-object behavior to sticking, rather than allowing you... 
X-Git-Tag: RELEASE_0_2_0_RC1~522
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=0ce885d03036bf8a2c2f58c1dc3f37345d5d9ac2

reverted embedded-in-other-object behavior to sticking, rather than allowing you to walk through it, to fix many maps


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

diff --git a/sv_phys.c b/sv_phys.c
index 09ec4653..9056bb20 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -268,13 +268,13 @@ int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
 
 		trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent);
 
-		/*
 		if (trace.allsolid)
-		{	// entity is trapped in another solid
+		{
+			// LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
+			// entity is trapped in another solid
 			VectorClear(ent->v.velocity);
 			return 3;
 		}
-		*/
 
 		if (trace.fraction > 0)
 		{	// actually covered some distance