Merge branch 'bones_was_here/all_no_glx' into 'master'

[xonotic/xonotic.git] / misc / tools / xonotic-map-screenshot

diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot
index dc06f12332f56c140c638ee803e3483b0674275c..5d1e6dbb054f498ab676075b621f1a899e2ca30d 100755 (executable)
--- a/misc/tools/xonotic-map-screenshot
+++ b/misc/tools/xonotic-map-screenshot
@@ -9,12 +9,18 @@ dummy=$1; shift
 count=`yes x | head -n "$count" | tr -cd x`
 
 ./all run \
+       -nocrashdialog \
        -nosound \
+       -noconfig \
        +'locksession 0' \
        +'scr_screenshot_timestamp 0' \
        +'vid_fullscreen 0' \
-       +'exec effects-ultimate.cfg' \
+       +'exec effects-ultra.cfg' \
        "$@" \
+       +'cl_welcome_in_menu_dialog 0' \
+       +'sv_precacheplayermodels 0' \
+       +'cl_hidewaypoints 1' \
+       +'cl_movement 0' \
        +'r_motionblur 0' \
        +'r_damageblur 0' \
        +'r_letterbox -1' \
@@ -23,13 +29,16 @@ count=`yes x | head -n "$count" | tr -cd x`
        +'sv_cheats 2' \
        +'sv_gravity 0' \
        +'r_nolerp 1' \
+       +'sv_clientcommand_antispam_time -999' \
+       +'sv_clientcommand_antispam_count 999' \
        +'set catchme "catchme_"' \
-       +"alias catchme_$count \"quit\"" \
-       +'alias NARF "sv_cmd nextframe cl_cmd nextframe $*"' \
-       +'alias ZORT "god; noclip; NARF POIT"' \
-       +'alias POIT "$catchme; set catchme \"${catchme}x\"; impulse 911; NARF TROZ"' \
+       +"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 TROZ "screenshot; NARF POIT"' \
-       +'alias cl_hook_gamestart_all "cmd join; defer 2 ZORT"' \
+       +'alias cl_hook_gamestart_all "defer 1.1 join; defer 2 ZORT"' \
        +"defer \"$watchdog\" quit" \
        +"map \"$map\"" \
        +'timelimit 0' \