X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-screenshot;h=867fd7dbbeba17f126b94ea63259ab41ad8391d2;hb=ceb891e7b45e92bdd8dce6ad9f4dce3642600584;hp=36f7e8ce74f96671dd26b0473c534817e9b88e9b;hpb=7e507cc3b710a03b5f36a614205795363e6f9d96;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot
index 36f7e8ce..867fd7db 100755
--- a/misc/tools/xonotic-map-screenshot
+++ b/misc/tools/xonotic-map-screenshot
@@ -3,25 +3,39 @@
 map=$1; shift
 count=$1; shift
 watchdog=$1; shift
+dummy=$1; shift
 
 # convert count to unary
 count=`yes x | head -n "$count" | tr -cd x`
 
 ./all run \
+	-nosound \
+	+'locksession 0' \
+	+'scr_screenshot_timestamp 0' \
 	+'vid_fullscreen 0' \
-	+'exec effects-ultimate.cfg' \
+	+'exec effects-ultra.cfg' \
 	"$@" \
+	+'sv_precacheplayermodels 0' \
 	+'r_motionblur 0' \
 	+'r_damageblur 0' \
 	+'r_letterbox -1' \
 	+'r_drawviewmodel 0' \
 	+'crosshair 0' \
-	+'sv_cheats 1' \
+	+'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 "autoscreenshot" "$catchme; set catchme \"${catchme}x\"; impulse 911; defer 1 \"screenshot; autoscreenshot\""' \
-	+'alias cl_hook_gamestart_all "cmd join; defer 1 god; defer 2 noclip; defer 3 autoscreenshot"' \
+	+'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"' \
 	+"defer \"$watchdog\" quit" \
 	+"map \"$map\"" \
 	+'timelimit 0' \
-	+'fraglimit 0'
+	+'fraglimit 0' \
+	</dev/null