]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix some disabled code so that it could compile again
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 21 Mar 2011 06:11:48 +0000 (06:11 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 25 Mar 2011 20:47:18 +0000 (21:47 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10953 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0246a8a37d58c76e5124736ff4697b8af1a3cfa8

cl_collision.c

index 57b6b4b5b667c42d5894140a87e8ec34b73306e9..93ba65989efbfd0e00f314c26fb4bc8006bd7123 100644 (file)
@@ -735,7 +735,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
                if (VectorCompare(start, end))
                        trace = CL_TracePoint(shiftstart, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
                else
-                       trace = CL_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+                       trace = CL_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities, false);
                VectorSubtract(trace.endpos, mins, trace.endpos);
                return trace;
        }