From 855d48dd8e27f817ed70b96bcb91ec853f0df9be Mon Sep 17 00:00:00 2001 From: "Dr. Jaska" Date: Fri, 18 Aug 2023 22:31:25 +0000 Subject: [PATCH] Fix "rounds played" scoreboard column showing up in DM in the layout with all columns --- .gitlab-ci.yml | 236 +++++++++++++++++----------------- qcsrc/server/round_handler.qc | 3 + qcsrc/server/scores_rules.qc | 2 - 3 files changed, 121 insertions(+), 120 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aca67b20..fcb8cfbe0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,118 +1,118 @@ -workflow: - rules: - - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/ - when: never - - when: always - -before_script: - - ln -s $PWD data/xonotic-data.pk3dir - - - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS -# FIXME: -march=native -mtune=native _changes the hash_, why?!? -# - export CC="gcc -pipe -march=native -mtune=native" - - export CC="gcc -pipe" - - - > - if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then - export QCC="$PWD/gmqcc" - chmod +x "$QCC" - else - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc - make -C gmqcc || exit 1 - export QCC="$PWD/gmqcc/gmqcc" - fi - - # Makefile: don't complain about lack of tags (fetching them is slow) - - export QCCFLAGS_WATERMARK=gitlab_pipeline - # Makefile: don't compress anything or complain about lack of zip program - - export ZIP=/bin/true - -test_compilation_units: - rules: - - changes: - - qcsrc/**/* - stage: test - script: - - make test - -test_sv_game: - stage: test - script: - - > - if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then - export ENGINE="$PWD/xonotic-linux64-dedicated" - chmod +x "$ENGINE" - else - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces - make -C darkplaces sv-release || exit 1 - export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic" - fi - - export ENGINE="$ENGINE -noconfig -nohome" - - - make qc || exit 1 - - - mkdir -p data/maps - - wget -nv -O data/maps/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp - - - while read LINE; do - echo $LINE; - [ "$LINE" = "All tests OK" ] && PASS=1; - done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit) - - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; } - - - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit - - diff notifications.cfg data/data/notifications_dump.cfg || - { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; } - -# - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3 -# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master! -# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3 -# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames -# but the autobuild server can run it and provide us the resulting pk3: - - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3 -# see also: misc/infrastructure/xonotic-release-build.cron - - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo - - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints - - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache - - - EXPECT=b2a88982cfc61339f82bbc9a956dbc30 - - HASH=$(${ENGINE} +exec serverbench.cfg - | tee /dev/stderr - | grep '^:' - | grep -v '^:gamestart:' - | grep -v '^:anticheat:' - | md5sum | awk '{ print $1 }') - - echo 'expected:' $EXPECT - - echo ' actual:' $HASH - - test "$HASH" == "$EXPECT" - - exit $? - - -# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs. -# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then -# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions. -#doxygen: # rename to 'pages' when gitlab.com allows pages to exceed 100MiB -# before_script: -# - ln -s $PWD data/xonotic-data.pk3dir # is this needed? -# - apt-get update -# - apt-get -y install doxygen graphviz -# stage: deploy -# script: -# - cd qcsrc && doxygen -# - mv html ../public -# - mkdir -p ~/.ssh -# - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done -# - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa -# - chmod 600 ~/.ssh/id_rsa -# - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config -# - git config --global user.name "Gitlab CI" -# - git config --global user.email "<>" -# - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_ -# - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_ -# - cp -r ../public/* ~/deploy -# - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages -# artifacts: -# paths: -# - public -# only: -# - master +workflow: + rules: + - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/ + when: never + - when: always + +before_script: + - ln -s $PWD data/xonotic-data.pk3dir + + - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS +# FIXME: -march=native -mtune=native _changes the hash_, why?!? +# - export CC="gcc -pipe -march=native -mtune=native" + - export CC="gcc -pipe" + + - > + if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then + export QCC="$PWD/gmqcc" + chmod +x "$QCC" + else + git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc + make -C gmqcc || exit 1 + export QCC="$PWD/gmqcc/gmqcc" + fi + + # Makefile: don't complain about lack of tags (fetching them is slow) + - export QCCFLAGS_WATERMARK=gitlab_pipeline + # Makefile: don't compress anything or complain about lack of zip program + - export ZIP=/bin/true + +test_compilation_units: + rules: + - changes: + - qcsrc/**/* + stage: test + script: + - make test + +test_sv_game: + stage: test + script: + - > + if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then + export ENGINE="$PWD/xonotic-linux64-dedicated" + chmod +x "$ENGINE" + else + git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces + make -C darkplaces sv-release || exit 1 + export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic" + fi + - export ENGINE="$ENGINE -noconfig -nohome" + + - make qc || exit 1 + + - mkdir -p data/maps + - wget -nv -O data/maps/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp + + - while read LINE; do + echo $LINE; + [ "$LINE" = "All tests OK" ] && PASS=1; + done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit) + - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; } + + - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit + - diff notifications.cfg data/data/notifications_dump.cfg || + { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; } + +# - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3 +# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master! +# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3 +# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames +# but the autobuild server can run it and provide us the resulting pk3: + - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3 +# see also: misc/infrastructure/xonotic-release-build.cron + - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo + - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints + - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache + + - EXPECT=27f38dfbbd72e4bf8f9b540882d5ccbe + - HASH=$(${ENGINE} +exec serverbench.cfg + | tee /dev/stderr + | grep '^:' + | grep -v '^:gamestart:' + | grep -v '^:anticheat:' + | md5sum | awk '{ print $1 }') + - echo 'expected:' $EXPECT + - echo ' actual:' $HASH + - test "$HASH" == "$EXPECT" + - exit $? + + +# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs. +# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then +# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions. +#doxygen: # rename to 'pages' when gitlab.com allows pages to exceed 100MiB +# before_script: +# - ln -s $PWD data/xonotic-data.pk3dir # is this needed? +# - apt-get update +# - apt-get -y install doxygen graphviz +# stage: deploy +# script: +# - cd qcsrc && doxygen +# - mv html ../public +# - mkdir -p ~/.ssh +# - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done +# - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa +# - chmod 600 ~/.ssh/id_rsa +# - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config +# - git config --global user.name "Gitlab CI" +# - git config --global user.email "<>" +# - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_ +# - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_ +# - cp -r ../public/* ~/deploy +# - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages +# artifacts: +# paths: +# - public +# only: +# - master diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index bb890e980..d47aad441 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -5,6 +5,7 @@ #include #include #include +#include #include void round_handler_Think(entity this) @@ -109,6 +110,8 @@ void round_handler_Spawn(bool() canRoundStart_func, bool() canRoundEnd_func, voi this.wait = false; round_handler_Init(5, 5, 180); this.nextthink = time; + + ScoreInfo_SetLabel_PlayerScore(SP_ROUNDS_PL, "rounds_pl", 0); } void round_handler_Reset(float next_think) diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index 2db5ae705..95f8b482e 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -58,8 +58,6 @@ void ScoreRules_basics(int teams, float sprio, float stprio, float score_enabled ScoreInfo_SetLabel_PlayerScore(SP_ELO, "elo", SFL_NOT_SORTABLE); } - ScoreInfo_SetLabel_PlayerScore(SP_ROUNDS_PL, "rounds_pl", 0); - if(STAT(SHOWFPS)) ScoreInfo_SetLabel_PlayerScore(SP_FPS, "fps", SFL_NOT_SORTABLE); } -- 2.39.2