Merge branch 'sev/xolonium4_2' into 'master' master 58/merge
authorMario <>
Wed, 18 Nov 2020 20:12:03 +0000 (20:12 +0000)
committerMario <>
Wed, 18 Nov 2020 20:12:03 +0000 (20:12 +0000)
Update Xolonium fonts to version 4.2

See merge request xonotic/xonotic!72

62 files changed:
data/font-xolonium.pk3dir/fonts/README [deleted file]
data/font-xolonium.pk3dir/fonts/README.txt [new file with mode: 0755]
misc/buildfiles/win32/libd0_blind_id-0.dll [changed mode: 0755->0644]
misc/buildfiles/win32/libd0_rijndael-0.dll [changed mode: 0755->0644]
misc/buildfiles/win32/libfreetype-6.dll [changed mode: 0755->0644]
misc/buildfiles/win32/libgcc_s_dw2-1.dll [new file with mode: 0644]
misc/buildfiles/win32/libode-3.dll [deleted file]
misc/buildfiles/win32/libogg-0.dll [new file with mode: 0644]
misc/buildfiles/win32/libpng15-15.dll [deleted file]
misc/buildfiles/win32/libpng16-16.dll [new file with mode: 0644]
misc/buildfiles/win32/libtheora-0.dll [new file with mode: 0644]
misc/buildfiles/win32/libtheora.dll [deleted file]
misc/buildfiles/win32/libvorbis-0.dll [new file with mode: 0644]
misc/buildfiles/win32/libvorbisenc-2.dll [new file with mode: 0644]
misc/buildfiles/win32/libvorbisfile-3.dll [new file with mode: 0644]
misc/buildfiles/win32/libwinpthread-1.dll [new file with mode: 0644]
misc/buildfiles/win32/ogg.dll [deleted file]
misc/buildfiles/win32/vorbis.dll [deleted file]
misc/buildfiles/win32/vorbisenc.dll [deleted file]
misc/buildfiles/win32/vorbisfile.dll [deleted file]
misc/buildfiles/win64/libd0_blind_id-0.dll [changed mode: 0755->0644]
misc/buildfiles/win64/libd0_rijndael-0.dll [changed mode: 0755->0644]
misc/buildfiles/win64/libfreetype-6.dll [changed mode: 0755->0644]
misc/buildfiles/win64/libgcc_s_sjlj-1.dll [deleted file]
misc/buildfiles/win64/libode-3.dll [deleted file]
misc/buildfiles/win64/libogg-0.dll [new file with mode: 0644]
misc/buildfiles/win64/libogg.dll [deleted file]
misc/buildfiles/win64/libpng15-15.dll [deleted file]
misc/buildfiles/win64/libpng16-16.dll [new file with mode: 0644]
misc/buildfiles/win64/libstdc++-6.dll [deleted file]
misc/buildfiles/win64/libtheora-0.dll [new file with mode: 0644]
misc/buildfiles/win64/libtheora.dll [deleted file]
misc/buildfiles/win64/libvorbis-0.dll [new file with mode: 0644]
misc/buildfiles/win64/libvorbis.dll [deleted file]
misc/buildfiles/win64/libvorbisenc-2.dll [new file with mode: 0644]
misc/buildfiles/win64/libvorbisfile-3.dll [new file with mode: 0644]
misc/buildfiles/win64/libvorbisfile.dll [deleted file]
misc/buildfiles/win64/optional/libgcc_s_seh-1.dll [new file with mode: 0644]
misc/buildfiles/win64/optional/libode3.dll [new file with mode: 0644]
misc/buildfiles/win64/optional/libstdc++-6.dll [new file with mode: 0644]
misc/buildfiles/win64/optional/libwinpthread-1.dll [new file with mode: 0644]
misc/buildfiles/win64/vorbisenc.dll [deleted file]
misc/tools/rsync-updater/cygpopt-0.dll [new file with mode: 0644]

diff --git a/data/font-xolonium.pk3dir/fonts/README b/data/font-xolonium.pk3dir/fonts/README
deleted file mode 100755 (executable)
index 2fff41d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright 2011-2016 Severin Meyer <>
-This is a special GPL version of the Xolonium font,
-intended for Xonotic. Find the public release at
-This font is free software. You can redistribute and/or
-modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation,
-either version 2 of the license, or any later version.
-This font is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty
-See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this font. If not, see <>.
-As a special exception, if you create a document which uses this
-font, and embed this font or unaltered portions of this font into
-the document, this font does not by itself cause the resulting
-document to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why
-the document might be covered by the GNU General Public License.
-If you modify this font, you may extend this exception to your
-version of the font, but you are not obligated to do so. If you do
-not wish to do so, delete this exception statement from your version.
diff --git a/data/font-xolonium.pk3dir/fonts/README.txt b/data/font-xolonium.pk3dir/fonts/README.txt
new file mode 100755 (executable)
index 0000000..dc49684
--- /dev/null
@@ -0,0 +1,32 @@
+Copyright 2011-2020 Severin Meyer <>
+This is a special GPL version of the Xolonium font,
+intended for Xonotic. Find the public release at
+This font is free software. You can redistribute and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation,
+either version 2 of the license, or any later version.
+This font is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty
+See the GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this font. If not, see <>.
+As a special exception, if you create a document which uses this
+font, and embed this font or unaltered portions of this font into
+the document, this font does not by itself cause the resulting
+document to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why
+the document might be covered by the GNU General Public License.
+If you modify this font, you may extend this exception to your
+version of the font, but you are not obligated to do so. If you do
+not wish to do so, delete this exception statement from your version.
index cdcbb28..f1055f8 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf differ
index 0d22516..d450fc0 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ
index 1e41b76..e10d0ef 100644 (file)
Binary files a/misc/buildfiles/win32/libcurl-4.dll and b/misc/buildfiles/win32/libcurl-4.dll differ
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index b4f9481..e834252
Binary files a/misc/buildfiles/win32/libfreetype-6.dll and b/misc/buildfiles/win32/libfreetype-6.dll differ
diff --git a/misc/buildfiles/win32/libgcc_s_dw2-1.dll b/misc/buildfiles/win32/libgcc_s_dw2-1.dll
new file mode 100644 (file)
index 0000000..d798146
Binary files /dev/null and b/misc/buildfiles/win32/libgcc_s_dw2-1.dll differ
index 33b5eb8..0f9fef2 100644 (file)
Binary files a/misc/buildfiles/win32/libgmp-10.dll and b/misc/buildfiles/win32/libgmp-10.dll differ
index 99c0215..db964a5 100644 (file)
Binary files a/misc/buildfiles/win32/libjpeg.dll and b/misc/buildfiles/win32/libjpeg.dll differ
diff --git a/misc/buildfiles/win32/libode-3.dll b/misc/buildfiles/win32/libode-3.dll
deleted file mode 100755 (executable)
index b8a7bba..0000000
Binary files a/misc/buildfiles/win32/libode-3.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/libogg-0.dll b/misc/buildfiles/win32/libogg-0.dll
new file mode 100644 (file)
index 0000000..60019b9
Binary files /dev/null and b/misc/buildfiles/win32/libogg-0.dll differ
diff --git a/misc/buildfiles/win32/libpng15-15.dll b/misc/buildfiles/win32/libpng15-15.dll
deleted file mode 100755 (executable)
index 956af87..0000000
Binary files a/misc/buildfiles/win32/libpng15-15.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/libpng16-16.dll b/misc/buildfiles/win32/libpng16-16.dll
new file mode 100644 (file)
index 0000000..931bbb1
Binary files /dev/null and b/misc/buildfiles/win32/libpng16-16.dll differ
diff --git a/misc/buildfiles/win32/libtheora-0.dll b/misc/buildfiles/win32/libtheora-0.dll
new file mode 100644 (file)
index 0000000..0bac5ea
Binary files /dev/null and b/misc/buildfiles/win32/libtheora-0.dll differ
diff --git a/misc/buildfiles/win32/libtheora.dll b/misc/buildfiles/win32/libtheora.dll
deleted file mode 100644 (file)
index ef66bd7..0000000
Binary files a/misc/buildfiles/win32/libtheora.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/libvorbis-0.dll b/misc/buildfiles/win32/libvorbis-0.dll
new file mode 100644 (file)
index 0000000..a9d689f
Binary files /dev/null and b/misc/buildfiles/win32/libvorbis-0.dll differ
diff --git a/misc/buildfiles/win32/libvorbisenc-2.dll b/misc/buildfiles/win32/libvorbisenc-2.dll
new file mode 100644 (file)
index 0000000..7a310ae
Binary files /dev/null and b/misc/buildfiles/win32/libvorbisenc-2.dll differ
diff --git a/misc/buildfiles/win32/libvorbisfile-3.dll b/misc/buildfiles/win32/libvorbisfile-3.dll
new file mode 100644 (file)
index 0000000..28b5e22
Binary files /dev/null and b/misc/buildfiles/win32/libvorbisfile-3.dll differ
diff --git a/misc/buildfiles/win32/libwinpthread-1.dll b/misc/buildfiles/win32/libwinpthread-1.dll
new file mode 100644 (file)
index 0000000..a0da968
Binary files /dev/null and b/misc/buildfiles/win32/libwinpthread-1.dll differ
diff --git a/misc/buildfiles/win32/ogg.dll b/misc/buildfiles/win32/ogg.dll
deleted file mode 100644 (file)
index 76bc621..0000000
Binary files a/misc/buildfiles/win32/ogg.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/vorbis.dll b/misc/buildfiles/win32/vorbis.dll
deleted file mode 100644 (file)
index d19353b..0000000
Binary files a/misc/buildfiles/win32/vorbis.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/vorbisenc.dll b/misc/buildfiles/win32/vorbisenc.dll
deleted file mode 100644 (file)
index feb0808..0000000
Binary files a/misc/buildfiles/win32/vorbisenc.dll and /dev/null differ
diff --git a/misc/buildfiles/win32/vorbisfile.dll b/misc/buildfiles/win32/vorbisfile.dll
deleted file mode 100644 (file)
index 2892040..0000000
Binary files a/misc/buildfiles/win32/vorbisfile.dll and /dev/null differ
index 2b0072b..ff0b039 100644 (file)
Binary files a/misc/buildfiles/win32/zlib1.dll and b/misc/buildfiles/win32/zlib1.dll differ
index 4474020..5a4d465 100644 (file)
Binary files a/misc/buildfiles/win64/libcurl-4.dll and b/misc/buildfiles/win64/libcurl-4.dll differ
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 00e4a26..d98acce
Binary files a/misc/buildfiles/win64/libfreetype-6.dll and b/misc/buildfiles/win64/libfreetype-6.dll differ
diff --git a/misc/buildfiles/win64/libgcc_s_sjlj-1.dll b/misc/buildfiles/win64/libgcc_s_sjlj-1.dll
deleted file mode 100755 (executable)
index c188bb1..0000000
Binary files a/misc/buildfiles/win64/libgcc_s_sjlj-1.dll and /dev/null differ
index c8679dd..b02fd2e 100644 (file)
Binary files a/misc/buildfiles/win64/libgmp-10.dll and b/misc/buildfiles/win64/libgmp-10.dll differ
index a7440c4..ac678f6 100644 (file)
Binary files a/misc/buildfiles/win64/libjpeg.dll and b/misc/buildfiles/win64/libjpeg.dll differ
diff --git a/misc/buildfiles/win64/libode-3.dll b/misc/buildfiles/win64/libode-3.dll
deleted file mode 100755 (executable)
index b1922c8..0000000
Binary files a/misc/buildfiles/win64/libode-3.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libogg-0.dll b/misc/buildfiles/win64/libogg-0.dll
new file mode 100644 (file)
index 0000000..a9122ca
Binary files /dev/null and b/misc/buildfiles/win64/libogg-0.dll differ
diff --git a/misc/buildfiles/win64/libogg.dll b/misc/buildfiles/win64/libogg.dll
deleted file mode 100644 (file)
index fcf7152..0000000
Binary files a/misc/buildfiles/win64/libogg.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libpng15-15.dll b/misc/buildfiles/win64/libpng15-15.dll
deleted file mode 100755 (executable)
index 9f869db..0000000
Binary files a/misc/buildfiles/win64/libpng15-15.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libpng16-16.dll b/misc/buildfiles/win64/libpng16-16.dll
new file mode 100644 (file)
index 0000000..3c9163e
Binary files /dev/null and b/misc/buildfiles/win64/libpng16-16.dll differ
diff --git a/misc/buildfiles/win64/libstdc++-6.dll b/misc/buildfiles/win64/libstdc++-6.dll
deleted file mode 100755 (executable)
index 7987513..0000000
Binary files a/misc/buildfiles/win64/libstdc++-6.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libtheora-0.dll b/misc/buildfiles/win64/libtheora-0.dll
new file mode 100644 (file)
index 0000000..45df885
Binary files /dev/null and b/misc/buildfiles/win64/libtheora-0.dll differ
diff --git a/misc/buildfiles/win64/libtheora.dll b/misc/buildfiles/win64/libtheora.dll
deleted file mode 100644 (file)
index fe78cd5..0000000
Binary files a/misc/buildfiles/win64/libtheora.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libvorbis-0.dll b/misc/buildfiles/win64/libvorbis-0.dll
new file mode 100644 (file)
index 0000000..4b7f0dc
Binary files /dev/null and b/misc/buildfiles/win64/libvorbis-0.dll differ
diff --git a/misc/buildfiles/win64/libvorbis.dll b/misc/buildfiles/win64/libvorbis.dll
deleted file mode 100644 (file)
index e0a34d3..0000000
Binary files a/misc/buildfiles/win64/libvorbis.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/libvorbisenc-2.dll b/misc/buildfiles/win64/libvorbisenc-2.dll
new file mode 100644 (file)
index 0000000..886d4d5
Binary files /dev/null and b/misc/buildfiles/win64/libvorbisenc-2.dll differ
diff --git a/misc/buildfiles/win64/libvorbisfile-3.dll b/misc/buildfiles/win64/libvorbisfile-3.dll
new file mode 100644 (file)
index 0000000..5954fd5
Binary files /dev/null and b/misc/buildfiles/win64/libvorbisfile-3.dll differ
diff --git a/misc/buildfiles/win64/libvorbisfile.dll b/misc/buildfiles/win64/libvorbisfile.dll
deleted file mode 100644 (file)
index cb8aca5..0000000
Binary files a/misc/buildfiles/win64/libvorbisfile.dll and /dev/null differ
diff --git a/misc/buildfiles/win64/optional/libgcc_s_seh-1.dll b/misc/buildfiles/win64/optional/libgcc_s_seh-1.dll
new file mode 100644 (file)
index 0000000..d43d330
Binary files /dev/null and b/misc/buildfiles/win64/optional/libgcc_s_seh-1.dll differ
diff --git a/misc/buildfiles/win64/optional/libode3.dll b/misc/buildfiles/win64/optional/libode3.dll
new file mode 100644 (file)
index 0000000..3c1c81e
Binary files /dev/null and b/misc/buildfiles/win64/optional/libode3.dll differ
diff --git a/misc/buildfiles/win64/optional/libstdc++-6.dll b/misc/buildfiles/win64/optional/libstdc++-6.dll
new file mode 100644 (file)
index 0000000..7207a99
Binary files /dev/null and b/misc/buildfiles/win64/optional/libstdc++-6.dll differ
diff --git a/misc/buildfiles/win64/optional/libwinpthread-1.dll b/misc/buildfiles/win64/optional/libwinpthread-1.dll
new file mode 100644 (file)
index 0000000..f5d9c22
Binary files /dev/null and b/misc/buildfiles/win64/optional/libwinpthread-1.dll differ
diff --git a/misc/buildfiles/win64/vorbisenc.dll b/misc/buildfiles/win64/vorbisenc.dll
deleted file mode 100644 (file)
index 513a5f5..0000000
Binary files a/misc/buildfiles/win64/vorbisenc.dll and /dev/null differ
index 4194c0d..7e8e6fd 100644 (file)
Binary files a/misc/buildfiles/win64/zlib1.dll and b/misc/buildfiles/win64/zlib1.dll differ
index 5bed45e..75d814c 100755 (executable)
@@ -1,28 +1,48 @@
+if [ -z "$RELEASETYPE" ]; then
+       export RELEASETYPE=autobuild
+       #export RELEASETYPE=release
+case "$RELEASETYPE" in
+       autobuild)
+               RELEASETYPEDIR=
+               ;;
+       *)
+               RELEASETYPENAME="$RELEASETYPE-like build"
+               ;;
 # is being run as cronjob, better set PATH
-export PATH=/home/xonotic-build/bin:/usr/local/bin:/usr/bin:/bin:/usr/games
+export PATH=/home/xonotic-build/ccache:/home/xonotic-build/bin:/usr/local/bin:/usr/bin:/bin:/usr/games
+# TEST: use s2tc, high quality
+#export dds_tool=s2tc
-if ! lockfile-create "$me"; then
-       exit 1
+if rm "$me.not-today" 2>/dev/null; then
+       echo "No build today (not-today marker removed)!"
+       exit 0
-lockfile-touch "$me" & lockpid=$!
-trap 'kill $lockpid || true; cd "$mepwd"; lockfile-remove "$me"' EXIT
-trap 'exit 1' INT TERM
 set -ex
-export HOSTS_THAT_ARE_MYSELF="xonotic-build-win32 xonotic-build-win64"
-ssh xonotic-beta '
-       cd autobuild/;
+ssh '
+       set -e;
+       cd HTML/autobuild/;
        s0=`date -d "now - 7 days - 12 hours" +%s`;
        s00=`date -d "now - 60 days - 12 hours" +%s`;
-       for X in *; do
+       for X in * */*; do
                [ -f "$X" ] || continue;
-               d=${X#Xonotic-};
-               d=${d%%[_-.]*};
+               d=${X##*/};
+               d=${d#Xonotic-};
+               d=${d#gmqcc-};
+               d=${d%%[-_.]*};
                [ x"$d" != x"latest" ] || continue;
                w=`date -d $d +%w`;
                s=`date -d $d +%s`;
@@ -33,34 +53,35 @@ ssh xonotic-beta '
 cd ~/xonotic-release-build
 ./all clean --reclone
+# ./all checkout maint
+./all checkout
 ./all each git checkout HEAD^0
 # add all feature branches we want
 # map branches that we include:
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
-# uncomment below when a branch is needed
-# the listed branches are examples only
-#for b in \
-#      origin/fruitiex/runningmanctf \
-#      origin/mintox/geoplanetary
-#      b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
+## for b in \
+##     origin/divVerent/rebase/for-autobuild \
+## ; do
+##     b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
+## done
 ./all update -N
 d0=`date +%Y%m%d`
-while HEAD"Xonotic-$"; do
+while HEAD"$RELEASETYPEDIR""Xonotic-$"; do
-RELEASETYPE=beta RELEASEDATE=$d ./all release
+RELEASEDATE=$d xvfb-run ./all release
 for X in Xonotic-$d*.zip; do
        ln -snf "$X" "Xonotic-latest${X#Xonotic-$d}"
-rsync -vaSHP Xonotic*.zip xonotic-beta:autobuild/
-ssh xonotic-beta sh "$d"
-echo "Finished a new beta build at" | $IRCSPAM
+rsync -vaSHP Xonotic*.zip"$RELEASETYPEDIR"
+if [ -z "$RELEASETYPEDIR" ]; then
+       ssh sh "$d"
index 03499ba..583da9d 100644 (file)
@@ -13,7 +13,7 @@ allrepos()
        "$@" d0_blind_id                   d0_blind_id.git              master         ""
        "$@" data/xonotic-maps.pk3dir      xonotic-maps.pk3dir.git      master         ""
        "$@" mediasource                   mediasource.git              master         "no"
-       "$@" gmqcc                         gmqcc.git                    master         ""
+       "$@" gmqcc                         gmqcc.git                    main           ""
        "$@" xonstat                       xonstat.git                  master         "no"
        "$@" xonstatdb                     xonstatdb.git                master         "no"
        "$@"                       master         "no"
@@ -34,9 +34,9 @@ allmirrors()
        # Gitlab host (divVerent).
        "$@" http gitlab     ''
-       # German host (divVerent).
-       "$@" git  de   git://   ''
-       "$@" http de  ''
+       # German host - disabled (divVerent).
+       "$@" git  ''   git://   ''
+       "$@" http ''  ''
        # Pushing destination (authoritative server; merlijn).
        "$@" ssh  push ssh://       ''
index 052da99..b495540 100644 (file)
Binary files a/misc/tools/rsync-updater/chmod.exe and b/misc/tools/rsync-updater/chmod.exe differ
index fd5df87..f6e242b 100644 (file)
Binary files a/misc/tools/rsync-updater/cyggcc_s-1.dll and b/misc/tools/rsync-updater/cyggcc_s-1.dll differ
index e4d7b95..9a00513 100644 (file)
Binary files a/misc/tools/rsync-updater/cygiconv-2.dll and b/misc/tools/rsync-updater/cygiconv-2.dll differ
index 18c5082..a98eb67 100644 (file)
Binary files a/misc/tools/rsync-updater/cygintl-8.dll and b/misc/tools/rsync-updater/cygintl-8.dll differ
diff --git a/misc/tools/rsync-updater/cygpopt-0.dll b/misc/tools/rsync-updater/cygpopt-0.dll
new file mode 100644 (file)
index 0000000..d44aeb9
Binary files /dev/null and b/misc/tools/rsync-updater/cygpopt-0.dll differ
index 3db37e7..8152109 100644 (file)
Binary files a/misc/tools/rsync-updater/cygwin1.dll and b/misc/tools/rsync-updater/cygwin1.dll differ
index f147bf1..cafd87a 100644 (file)
Binary files a/misc/tools/rsync-updater/rsync.exe and b/misc/tools/rsync-updater/rsync.exe differ
index f4324c1..f402d2d 100755 (executable)
@@ -31,13 +31,13 @@ count=`yes x | head -n "$count" | tr -cd x`
        +'sv_clientcommand_antispam_time -999' \
        +'sv_clientcommand_antispam_count 999' \
        +'set catchme "catchme_"' \
-       +"alias catchme_$count \"quit\"" \
+       +"alias catchme_$count quit" \
        +'alias NARF "sv_cmd nextframe cl_cmd nextframe sv_cmd nextframe cl_cmd nextframe $*"' \
        +'alias ZORT "god; NARF EGAD"' \
        +'alias EGAD "noclip; NARF POIT"' \
-       +'alias POIT "$catchme; set catchme \"${catchme}x\"; impulse 911; NARF TROZ"' \
+       +'alias POIT "$catchme; set catchme ${catchme}x; impulse 911; NARF TROZ"' \
        +'alias TROZ "screenshot; NARF POIT"' \
-       +'alias cl_hook_gamestart_all "defer 1.1 \"cmd join\"; defer 2 ZORT"' \
+       +'alias cl_hook_gamestart_all "defer 1.1 join; defer 2 ZORT"' \
        +"defer \"$watchdog\" quit" \
        +"map \"$map\"" \
        +'timelimit 0' \