colorize cvarlist and completion nicely

[xonotic/darkplaces.git] / collision.c

diff --git a/collision.c b/collision.c
index d388204e47161a1491102d345389cd606237abad..b97a0df351f37177a1940be71f86afa7faa70636 100644 (file)
--- a/collision.c
+++ b/collision.c
@@ -775,6 +775,7 @@ void Collision_TraceLineBrushFloat(trace_t *trace, const vec3_t linestart, const
                                        // calculate the nudged fraction and impact normal we'll
                                        // need if we accept this collision later
                                        enterfrac2 = (d1 - collision_impactnudge.value) * imove;
+                                       ie = 1.0f - enterfrac;
                                        newimpactplane.normal[0] = startplane->normal[0] * ie + endplane->normal[0] * enterfrac;
                                        newimpactplane.normal[1] = startplane->normal[1] * ie + endplane->normal[1] * enterfrac;
                                        newimpactplane.normal[2] = startplane->normal[2] * ie + endplane->normal[2] * enterfrac;
@@ -1540,7 +1541,7 @@ void Collision_CombineTraces(trace_t *cliptrace, const trace_t *trace, void *tou
        //      cliptrace->inopen = true;
        if (trace->inwater)
                cliptrace->inwater = true;
-       if (trace->realfraction <= cliptrace->realfraction)
+       if ((trace->realfraction <= cliptrace->realfraction) && (VectorLength2(trace->plane.normal) > 0))
        {
                cliptrace->fraction = trace->fraction;
                cliptrace->realfraction = trace->realfraction;