Properly calculate falling damage based on player scale. Don't just offset the damage...

[voretournament/voretournament.git] / data / qcsrc / server / t_jumppads.qc

diff --git a/data/qcsrc/server/t_jumppads.qc b/data/qcsrc/server/t_jumppads.qc
index 906e63de4e034691b2db364844453363f22c154e..b875c211eaf3d50d064264d60ca5a50945d791d0 100644 (file)
--- a/data/qcsrc/server/t_jumppads.qc
+++ b/data/qcsrc/server/t_jumppads.qc
@@ -121,8 +121,12 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
        }\r
        vs = sdist / trigger_push_calculatevelocity_flighttime;\r
 \r
+       // apply size-based weight to jump pads\r
+       float scalefac;\r
+       scalefac = (cvar("g_healthsize") && other.classname == "player") ? pow(other.scale, cvar("g_healthsize_weight") * 0.5) : 1;\r
+\r
        // finally calculate the velocity\r
-       return sdir * vs + '0 0 1' * vz;\r
+       return sdir * vs + '0 0 1' * vz * scalefac;\r
 }\r
 \r
 void trigger_push_touch()\r