From: bones_was_here <bones_was_here@xonotic.au>
Date: Tue, 7 Feb 2023 05:20:41 +0000 (+1000)
Subject: Adjust jump pad velocity on Q3 maps to match 125fps frametime-dependent behaviour
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d616019ecc2bec92b1413535321d43c5f6a47a8e;p=xonotic%2Fxonotic-data.pk3dir.git

Adjust jump pad velocity on Q3 maps to match 125fps frametime-dependent behaviour
---

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index eee980618..72d9916d1 100644
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -39,6 +39,13 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht, entity p
 	if(pushed_entity && pushed_entity.gravity)
 		grav *= pushed_entity.gravity;
 
+	// Q3 has frametime-dependent gravity, but its trigger_push velocity calculation doesn't account for that.
+	// This discrepancy can be simulated accurately with a multiplier which here ensures that
+	// all entities will arrive where they would in Q3 at 125fps, even if entity-specific gravity is applied.
+	// See physicsCPMA.cfg for the source of the magic number.
+	if (STAT(Q3COMPAT, pushed_entity) && GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE)
+		grav *= 1.056530513;
+
 	zdist = torg.z - org.z;
 	sdist = vlen(torg - org - zdist * '0 0 1');
 	sdir = normalize(torg - org - zdist * '0 0 1');