From: terencehill Date: Tue, 2 Mar 2021 17:03:42 +0000 (+0100) Subject: Fix compilation units and update hash X-Git-Tag: xonotic-v0.8.5~535 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9234ac3f99c60f5fb7efe997563643e36c8a71b;p=xonotic%2Fxonotic-data.pk3dir.git Fix compilation units and update hash --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b14690d05..49b7611f9 100644 --- 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 cd74ae544..4d36cb2e0 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -1,5 +1,6 @@ #include "waypoints.qh" +#include #include #include #include diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 120b738e2..d7940c89b 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -2,7 +2,6 @@ #include #include -#include #include #include #include