Merge remote-tracking branch 'origin/bones_was_here/q3compat_gravity' into morosophos...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / trigger / jumppads.qc

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index d6ab65492ca4185fbd986e29451b36e52e5b519a..faf8ea1e1ed40ac11f1209950df0d7b31be5891d 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -41,11 +41,12 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht, entity p
                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) && GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE)
-               grav *= 1.056530513;
+       // This discrepancy can be simulated accurately which ensures that all entities will arrive
+       // where they would in Q3 with gravity 800 at 125fps, even if entity-specific gravity is applied.
+       // This can be hard-coded because we don't support the Q3 world.gravity field at this time.
+       // See physicsCPMA.cfg for maths and test results.
+       if (Q3COMPAT_COMMON)
+               grav /= 750/800; // exact float, unlike 800/750
 
        zdist = torg.z - org.z;
        sdist = vlen(torg - org - zdist * '0 0 1');