reenabled the 'stick in place if stuck in a solid' code, but changed it to only apply...

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

diff --git a/sv_phys.c b/sv_phys.c
index 2797f2789ac406b117b414ee3f874f223e68f34d..895e6876a9d1ef12179624abdb243757c27881e3 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -370,15 +370,15 @@ int SV_FlyMove (prvm_edict_t *ent, float time, float *stepnormal)
                Con_Print("\n");
 #endif
 
-               /*
-               if (trace.startsolid)
+               if (trace.bmodelstartsolid)
                {
-                       // LordHavoc: note: this code is what makes entities stick in place if embedded in another object (which can be the world)
+                       // LordHavoc: note: this code is what makes entities stick in place
+                       // if embedded in world only (you can walk through other objects if
+                       // stuck)
                        // entity is trapped in another solid
                        VectorClear(ent->fields.server->velocity);
                        return 3;
                }
-               */
 
                // break if it moved the entire distance
                if (trace.fraction == 1)