As a minor speedup, inline the set_movetype function into the main physics loop ...

Also, fix CI script's reference to an invalid file

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a642354fa355a5928bf8c892bbc4b1f83eb3d860..87b1dd36d8b85844f7034fe5e5c752e1e36aae36 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ test_sv_game:
     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
     - 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
-    - wget -O data/maps/stormkeep.waypoints.hardwired https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.hardwired
     - make
     - EXPECT=361b1766b4fc23f28b7f3149050fdbb2
     - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 7502bdb9dd6783b584807e5bcf731c2e7bf408fc..0b3783488cb7dbdc50a7d295e0a7cf2eb75fe8a9 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2033,7 +2033,9 @@ void Physics_Frame()
                if(IS_CLIENT(it) || it.classname == "" || it.move_movetype == MOVETYPE_PUSH || it.move_movetype == MOVETYPE_FAKEPUSH || it.move_movetype == MOVETYPE_PHYSICS)
                        continue;
 
-               set_movetype(it, it.move_movetype);
+               //set_movetype(it, it.move_movetype);
+               // inline the set_movetype function, since this is called a lot
+               it.movetype = (it.move_qcphysics) ? MOVETYPE_NONE : it.move_movetype;
 
                if(it.move_movetype == MOVETYPE_NONE)
                        continue;