fix restart command (can't do the "connect local" for a restart)

[xonotic/darkplaces.git] / collision.c

diff --git a/collision.c b/collision.c
index 05c0f70ec0ac26eca068af22124adffa98f74bbd..01904128dcdead51fa278538459cf78dbac82bb6 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -33,8 +33,6 @@ static int RecursiveHullCheck (RecursiveHullCheckTraceInfo_t *t, int num, double
        int ret;
        mplane_t *plane;
        double t1, t2;
-       //double frac;
-       //double mid[3];
 
        // variables that need to be stored on the stack when recursing
        dclipnode_t *node;
@@ -170,6 +168,7 @@ loc0:
 // used if start and end are the same
 static void RecursiveHullCheckPoint (RecursiveHullCheckTraceInfo_t *t, int num)
 {
+       // If you can read this, you understand BSP trees
        while (num >= 0)
                num = t->hull->clipnodes[num].children[((t->hull->planes[t->hull->clipnodes[num].planenum].type < 3) ? (t->start[t->hull->planes[t->hull->clipnodes[num].planenum].type]) : (DotProduct(t->hull->planes[t->hull->clipnodes[num].planenum].normal, t->start))) < t->hull->planes[t->hull->clipnodes[num].planenum].dist];
 
@@ -377,7 +376,7 @@ void Collision_ClipTrace (trace_t *trace, const void *cent, const model_t *cmode
                VectorCopy(endd, rhc.end);
                VectorCopy(rhc.end, rhc.trace->endpos);
                VectorSubtract(rhc.end, rhc.start, rhc.dist);
-               if (DotProduct(rhc.dist, rhc.dist) > 0.00001)
+               if (rhc.dist[0] || rhc.dist[1] || rhc.dist[2])
                        RecursiveHullCheck (&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
                else
                        RecursiveHullCheckPoint (&rhc, rhc.hull->firstclipnode);
@@ -401,12 +400,12 @@ void Collision_ClipTrace (trace_t *trace, const void *cent, const model_t *cmode
                                rhc.trace->plane.normal[1] = DotProduct (tempd, left);
                                rhc.trace->plane.normal[2] = DotProduct (tempd, up);
                        }
-                       // fix offset
-                       VectorAdd (rhc.trace->endpos, offset, rhc.trace->endpos);
                        rhc.trace->ent = (void *) cent;
                }
                else if (rhc.trace->allsolid || rhc.trace->startsolid)
                        rhc.trace->ent = (void *) cent;
+               // fix offset
+               VectorAdd (rhc.trace->endpos, offset, rhc.trace->endpos);
        }
        else
        {
@@ -415,11 +414,11 @@ void Collision_ClipTrace (trace_t *trace, const void *cent, const model_t *cmode
                rhc.hull = HullForBBoxEntity (corigin, cmins, cmaxs, mins, maxs, offset);
 
                // trace a line through the generated clipping hull
-               VectorCopy(startd, rhc.start);
-               VectorCopy(endd, rhc.end);
+               VectorSubtract(start, offset, rhc.start);
+               VectorSubtract(end, offset, rhc.end);
                VectorCopy(rhc.end, rhc.trace->endpos);
                VectorSubtract(rhc.end, rhc.start, rhc.dist);
-               if (DotProduct(rhc.dist, rhc.dist) > 0.00001)
+               if (rhc.dist[0] || rhc.dist[1] || rhc.dist[2])
                        RecursiveHullCheck (&rhc, rhc.hull->firstclipnode, 0, 1, rhc.start, rhc.end);
                else
                        RecursiveHullCheckPoint (&rhc, rhc.hull->firstclipnode);
@@ -435,3 +434,4 @@ void Collision_ClipTrace (trace_t *trace, const void *cent, const model_t *cmode
                        rhc.trace->ent = (void *) cent;
        }
 }
+