Calculate impact speed starting from minimum velocity, not actual velocity. Also...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / sandbox.qc

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 3b07fc8b55c594c5818f12adbd07e0d99f21a7b4..b8f30c42c8722c12d66477d191f7e4f50a9a8113 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -19,11 +19,12 @@ void sandbox_Object_Touch()
        // make particle count and sound volume depend on impact speed
        float intensity;
        intensity = vlen(self.velocity) + vlen(other.velocity);
-       if(intensity) // check this first to avoid divisions by 0
+       if(intensity) // avoid divisions by 0
                intensity /= 2; // average the two velocities
        if not(intensity >= autocvar_g_sandbox_object_material_velocity_min)
                return; // impact not strong enough to do anything
        // now offset intensity and apply it to the effects
+       intensity -= autocvar_g_sandbox_object_material_velocity_min; // start from minimum velocity, not actual velocity
        intensity = bound(0, intensity * autocvar_g_sandbox_object_material_velocity_factor, 1);
 
        switch(self.material)