X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-screenshot;h=ce00dbc7729539208601680a86dd6b77e4c0bcd8;hp=1af7b4b77625752b37917b974b76caae21c1b716;hb=3125fa3054f80110424c799d6961f6c49e9baf9b;hpb=d350f6cf3d60df8a0b98fd9acd015f9058b8504d

diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot
index 1af7b4b7..ce00dbc7 100755
--- a/misc/tools/xonotic-map-screenshot
+++ b/misc/tools/xonotic-map-screenshot
@@ -10,24 +10,32 @@ count=`yes x | head -n "$count" | tr -cd x`
 
 ./all run \
 	-nosound \
+	-noconfig \
 	+'locksession 0' \
 	+'scr_screenshot_timestamp 0' \
 	+'vid_fullscreen 0' \
-	+'exec effects-ultimate.cfg' \
+	+'exec effects-ultra.cfg' \
 	"$@" \
+	+'sv_precacheplayermodels 0' \
+	+'cl_hidewaypoints 1' \
 	+'r_motionblur 0' \
 	+'r_damageblur 0' \
 	+'r_letterbox -1' \
 	+'r_drawviewmodel 0' \
 	+'crosshair 0' \
 	+'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 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 "echo HOOKED; cmd join; defer 2 ZORT"' \
+	+'alias cl_hook_gamestart_all "defer 1.1 \"cmd join\"; defer 2 ZORT"' \
 	+"defer \"$watchdog\" quit" \
 	+"map \"$map\"" \
 	+'timelimit 0' \