From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 17 Mar 2013 15:35:33 +0000 (+0200)
Subject: When trigger_gravity modifies the gravity of an entity, jump pads wouldn't account... 
X-Git-Tag: xonotic-v0.7.0~79^2~5^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c19da8d7d5746e76d9110906b414beff1541679;p=xonotic%2Fxonotic-data.pk3dir.git

When trigger_gravity modifies the gravity of an entity, jump pads wouldn't account that, causing players to be thrown at the incorrect destination.
---

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 5a5042b3d..0b6f7fc4c 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -37,6 +37,8 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 	torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5;
 
 	grav = autocvar_sv_gravity;
+	if(other.gravity)
+		grav *= other.gravity;
 
 	zdist = torg_z - org_z;
 	sdist = vlen(torg - org - zdist * '0 0 1');