fixed the wall slide stuttering bug (the one that has been annoying me for months...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 37b1ae5ffaafbb877b2fe352b07855f3aed1cfc3..5b3e29653f76a7c31c9567895669012b10717737 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -247,16 +247,30 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
                        VectorMA(ent->v->origin, time, ent->v->velocity, end);
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
                        //Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
+#ifdef COLLISIONPARANOID
+                       {
+                               int endstuck;
+                               vec3_t temp;
+                               VectorCopy(trace.endpos, temp);
+                               endstuck = SV_Move(temp, ent->v->mins, ent->v->maxs, temp, MOVE_WORLDONLY, ent).startsolid;
+                               Con_Printf("%s{%i:%f %f %f:%f %f %f:%f:%f %f %f%s%s}\n", (trace.startsolid || endstuck) ? "\002" : "", bumpcount, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], end[0] - ent->v->origin[0], end[1] - ent->v->origin[1], end[2] - ent->v->origin[2], trace.fraction, trace.endpos[0] - ent->v->origin[0], trace.endpos[1] - ent->v->origin[1], trace.endpos[2] - ent->v->origin[2], trace.startsolid ? " startstuck" : "", endstuck ? " endstuck" : "");
+                               //Con_Printf("trace %f %f %f : %f : %f %f %f\n", trace.endpos[0], trace.endpos[1], trace.endpos[2], trace.fraction, trace.plane.normal[0], trace.plane.normal[1], trace.plane.normal[2]);
+                               if (endstuck)
+                                       Cbuf_AddText("disconnect\n");
+                       }
+#endif
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // 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)
+                       if (trace.fraction >= 0.001)
                        {
                                // actually covered some distance
                                VectorCopy (trace.endpos, ent->v->origin);
@@ -341,13 +355,15 @@ int SV_FlyMove (edict_t *ent, float time, float *stepnormal)
 
                        trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
 
-                       if (trace.allsolid)
+                       /*
+                       if (trace.startsolid)
                        {
                                // 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)
                        {