Fix compilation units and update hash

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b14690d05229fefc33f0dea5f4d9e498e4098bef..49b7611f9a2f2b2c3fd0ba1344a1e29f10553f81 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,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=b27cc55a559011432946530e9a594aed
+    - EXPECT=d0fbc20e0d823c8d6919edfa68c5f389
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index cd74ae54474743506f277c4997f14ced974557d9..4d36cb2e0ceaddd88e26d61f53c6e77fc300b2e6 100644 (file)
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -1,5 +1,6 @@
 #include "waypoints.qh"
 
+#include <common/animdecide.qh>
 #include <common/constants.qh>
 #include <common/debug.qh>
 #include <common/gamemodes/_mod.qh>

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 120b738e27f038412861b3b49769e9c6a3cffbcc..d7940c89b369ba9e6d881cc6b7fd43b006b45860 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -2,7 +2,6 @@
 
 #include <common/anim.qh>
 #include <common/animdecide.qh>
-#include <common/animdecide.qh>
 #include <common/csqcmodel_settings.qh>
 #include <common/deathtypes/all.qh>
 #include <common/effects/all.qh>