]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix "rounds played" scoreboard column showing up in DM in the layout with all columns
authorDr. Jaska <drjaska83@gmail.com>
Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)
committerterencehill <piuntn@gmail.com>
Fri, 18 Aug 2023 22:31:25 +0000 (22:31 +0000)
.gitlab-ci.yml
qcsrc/server/round_handler.qc
qcsrc/server/scores_rules.qc

index 7aca67b20d3d3676d58c2305d77487a727eed974..fcb8cfbe05da5dae10b82bbc63ba083383e2efa4 100644 (file)
-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:\r
+  rules:\r
+    - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/\r
+      when: never\r
+    - when: always\r
+\r
+before_script:\r
+  - ln -s $PWD data/xonotic-data.pk3dir\r
+\r
+  - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS\r
+#   FIXME: -march=native -mtune=native _changes the hash_, why?!?\r
+# - export CC="gcc -pipe -march=native -mtune=native"\r
+  - export CC="gcc -pipe"\r
+\r
+  - >\r
+    if wget -nv https://beta.xonotic.org/pipeline-bin/gmqcc ; then\r
+      export QCC="$PWD/gmqcc"\r
+      chmod +x "$QCC"\r
+    else\r
+      git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc\r
+      make -C gmqcc || exit 1\r
+      export QCC="$PWD/gmqcc/gmqcc"\r
+    fi\r
+\r
+  # Makefile: don't complain about lack of tags (fetching them is slow)\r
+  - export QCCFLAGS_WATERMARK=gitlab_pipeline\r
+  # Makefile: don't compress anything or complain about lack of zip program\r
+  - export ZIP=/bin/true\r
+\r
+test_compilation_units:\r
+  rules:\r
+    - changes:\r
+      - qcsrc/**/*\r
+  stage: test\r
+  script:\r
+    - make test\r
+\r
+test_sv_game:\r
+  stage: test\r
+  script:\r
+    - >\r
+      if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then\r
+        export ENGINE="$PWD/xonotic-linux64-dedicated"\r
+        chmod +x "$ENGINE"\r
+      else\r
+        git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+        make -C darkplaces sv-release || exit 1\r
+        export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic"\r
+      fi\r
+    - export ENGINE="$ENGINE -noconfig -nohome"\r
+\r
+    - make qc || exit 1\r
+\r
+    - mkdir -p data/maps\r
+    - wget -nv -O data/maps/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
+\r
+    - while read LINE; do\r
+        echo $LINE;\r
+        [ "$LINE" = "All tests OK" ] && PASS=1;\r
+      done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit)\r
+    - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }\r
+\r
+    - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit\r
+    - diff notifications.cfg data/data/notifications_dump.cfg ||\r
+        { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
+\r
+#    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master!\r
+# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3\r
+# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames\r
+# but the autobuild server can run it and provide us the resulting pk3:\r
+    - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3\r
+# see also: misc/infrastructure/xonotic-release-build.cron\r
+    - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
+    - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
+    - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
+\r
+    - EXPECT=27f38dfbbd72e4bf8f9b540882d5ccbe\r
+    - HASH=$(${ENGINE} +exec serverbench.cfg\r
+      | tee /dev/stderr\r
+      | grep '^:'\r
+      | grep -v '^:gamestart:'\r
+      | grep -v '^:anticheat:'\r
+      | md5sum | awk '{ print $1 }')\r
+    - echo 'expected:' $EXPECT\r
+    - echo '  actual:' $HASH\r
+    - test "$HASH" == "$EXPECT"\r
+    - exit $?\r
+\r
+\r
+# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.\r
+# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then\r
+# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.\r
+#doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB\r
+#  before_script:\r
+#    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?\r
+#    - apt-get update\r
+#    - apt-get -y install doxygen graphviz\r
+#  stage: deploy\r
+#  script:\r
+#    - cd qcsrc && doxygen\r
+#    - mv html ../public\r
+#    - mkdir -p ~/.ssh\r
+#    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done\r
+#    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa\r
+#    - chmod 600 ~/.ssh/id_rsa\r
+#    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config\r
+#    - git config --global user.name "Gitlab CI"\r
+#    - git config --global user.email "<>"\r
+#    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_\r
+#    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_\r
+#    - cp -r ../public/* ~/deploy\r
+#    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages\r
+#  artifacts:\r
+#    paths:\r
+#      - public\r
+#  only:\r
+#    - master\r
index bb890e980a628738d1cf96ec9d74a81bf84089c8..d47aad441ec4add47fcbd7cba5eb8c39b5b0dc75 100644 (file)
@@ -5,6 +5,7 @@
 #include <common/util.qh>
 #include <server/campaign.qh>
 #include <server/command/vote.qh>
+#include <server/scores.qh>
 #include <server/world.qh>
 
 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)
index 2db5ae705e489149b83f2367d4129270c7628848..95f8b482edd65e2fdcf42903658399791cd4ed0f 100644 (file)
@@ -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);
 }