reverted embedded-in-other-object behavior to sticking, rather than allowing you...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 09ec4653e5b7df58d5965028270fd3a8cfeb55e4..9056bb20c92184d4d3f7f659fd2c7d2404479506 100644 (file)
--- 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