X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=misc%2Ftools%2Fxonotic-map-screenshot;h=ce00dbc7729539208601680a86dd6b77e4c0bcd8;hb=cd7078f2f7bd23108f92aed9f750f2749f65fb56;hp=1c65379c9f31cba0f8b63e3a1031c5b7a570bec3;hpb=3d41115769e27d69c06114abd3a2643e978cf665;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/xonotic-map-screenshot b/misc/tools/xonotic-map-screenshot
index 1c65379c..ce00dbc7 100755
--- a/misc/tools/xonotic-map-screenshot
+++ b/misc/tools/xonotic-map-screenshot
@@ -3,26 +3,41 @@
 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 \
+	-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 "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 "defer 1.1 \"cmd join\"; defer 2 ZORT"' \
 	+"defer \"$watchdog\" quit" \
 	+"map \"$map\"" \
 	+'timelimit 0' \
-	+'fraglimit 0'
+	+'fraglimit 0' \
+	</dev/null