From: bones_was_here <bones_was_here@xa.org.au>
Date: Fri, 18 Mar 2022 18:04:06 +0000 (+0000)
Subject: Make stepping up while jumping reliable
X-Git-Tag: xonotic-v0.8.5~154^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e920c714b7ee015ed0684b5c6db18819035efd0;p=xonotic%2Fxonotic-data.pk3dir.git

Make stepping up while jumping reliable
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d414f79..296e493a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=c7e360b409c6ceddff9c1407ce4e2090
+    - EXPECT=5d093940aa7306533fdcf8f12579b316
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'
diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 64a31cdbf..48aa9dd10 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -227,7 +227,8 @@ int _Movetype_FlyMove(entity this, float dt, bool applygravity, bool applystepno
 			}
 
 			// accept the new position if it made some progress...
-			if(fabs(this.origin_x - org.x) >= 0.03125 || fabs(this.origin_y - org.y) >= 0.03125)
+			// previously this checked if absolute distance >= 0.03125 which made stepping up unreliable
+			if(this.origin_x - org.x || this.origin_y - org.y)
 			{
 				trace_endpos = this.origin;
 				time_left *= 1 - trace2_fraction;