this patch may break things and needs testing

[xonotic/darkplaces.git] / r_explosion.c

diff --git a/r_explosion.c b/r_explosion.c
index a504dd3036ccc003a219fb9d0738bb338eec1530..0c343154e66a809be0b484f5d4e2865235bc6177 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -171,7 +171,7 @@ void R_NewExplosion(const vec3_t org)
                                // clip start origin
                                if (e->clipping)
                                {
-                                       trace = CL_TraceBox(e->origin, vec3_origin, vec3_origin, e->vert[j], true, NULL, SUPERCONTENTS_SOLID, false);
+                                       trace = CL_Move(e->origin, vec3_origin, vec3_origin, e->vert[j], MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
                                        VectorCopy(trace.endpos, e->vert[i]);
                                }
                        }
@@ -229,7 +229,7 @@ static void R_MoveExplosion(explosion_t *e)
                        VectorMA(e->vert[i], frametime, e->vertvel[i], end);
                        if (e->clipping)
                        {
-                               trace = CL_TraceBox(e->vert[i], vec3_origin, vec3_origin, end, true, NULL, SUPERCONTENTS_SOLID, false);
+                               trace = CL_Move(e->vert[i], vec3_origin, vec3_origin, end, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false);
                                if (trace.fraction < 1)
                                {
                                        // clip velocity against the wall