Make jump pads account the scale gravity of players, so macros can reach their destin...

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

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index 26cdc9c663cc263076cf667966111f6bde646b92..bc3457e71d272a8cd0e77eabce88cf2f6060a19a 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -344,4 +344,6 @@ Bug fixes:
 \r
 Features:\r
 \r
+- ?\r
+\r
 Known bugs:\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index dd4d822c628b483ab8764c631d1ce8aab10a51cf..8632a533942374dc430b0e8860248b7dc107f932 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -104,6 +104,8 @@
 \r
 - +0.8: Some sort of bullet time feature in single player, by setting the slowmo cvar\r
 \r
+- 0.8: Does the wind trigger brush need to account scale based gravity?\r
+\r
 - 0.8: Make some g_healthsize cvars g_balance_healthsize, and move them to balanceVT.cfg\r
 \r
 - 0.8: Make player fatness depend on frags, using a trick I heard about with shaders\r