From: Juhu <5894800-Juhu_@users.noreply.gitlab.com> Date: Fri, 7 Aug 2020 15:47:53 +0000 (+0200) Subject: Revert "update hash because of new strafe scoreboard option (change in :player:see... X-Git-Tag: xonotic-v0.8.5~738^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7a490464c6c9b64c38f51516448aa9b3017fabb;p=xonotic%2Fxonotic-data.pk3dir.git Revert "update hash because of new strafe scoreboard option (change in :player:see-labels:)" This reverts commit f65efbc94210b370eeb3efa471449593c5b30f36. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 971f039ec..7294f1722 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,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=5ac5a856dd23036e25523dcc54c5ee3b + - EXPECT=ea6a54e129f245d2472f33475962c8e7 - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg | tee /dev/stderr | grep '^:' diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc index 25b239276..84b35bbf6 100644 --- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc +++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc @@ -215,7 +215,6 @@ MUTATOR_HOOKFUNCTION(cts, AbortSpeedrun) MUTATOR_HOOKFUNCTION(cts, MakePlayerObserver) { entity player = M_ARGV(0, entity); - if(GameRules_scoring_add(player, RACE_FASTEST, 0)) player.frags = FRAGS_PLAYER_OUT_OF_GAME; else