From: bones_was_here Date: Wed, 21 Jul 2021 08:54:31 +0000 (+1000) Subject: Update hash and fix compilation unit test X-Git-Tag: xonotic-v0.8.5~352^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=631e0b44932e2f9ed3acfcf4d3bbfd4a4ff4d801;p=xonotic%2Fxonotic-data.pk3dir.git Update hash and fix compilation unit test --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5e8ad0d4..3dcd27e44 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=0052773aed8d3ee62f8a07cd774eec5c + - EXPECT=d1b8209ef263b8fbb59dbb205049af52 - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg | tee /dev/stderr | sed -e 's,^\[[^]]*\] ,,' diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh index 9851cd8f7..f4fad84de 100644 --- a/qcsrc/common/mutators/mutator/buffs/buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh @@ -45,6 +45,7 @@ STATIC_INIT(REGISTER_BUFFS) { #ifdef SVQC .entity buffdef; + .int team_forced; void buff_Init(entity ent); void buff_Init_Compat(entity ent, entity replacement); #define BUFF_SPAWNFUNC(e, b, t) spawnfunc(item_buff_##e) { \