ODE physics engine support, needs more work, disabled by default

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 7f6d9c64607fd9dfa24a9d7818f26398bd70444f..9ef311b12e7db318b6db3457d8fe72e83c418fef 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -728,13 +728,11 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
                VectorAdd(start, mins, shiftstart);
                VectorAdd(end, mins, shiftend);
                if (VectorCompare(start, end))
-                       return CL_TracePoint(shiftstart, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+                       trace = CL_TracePoint(shiftstart, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
                else
-               {
                        trace = CL_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
-                       VectorSubtract(trace.endpos, mins, trace.endpos);
-                       return trace;
-               }
+               VectorSubtract(trace.endpos, mins, trace.endpos);
+               return trace;
        }
 
        if (hitnetworkentity)