Merge MR 'Various Q3 and QL map entity features and fixes'

[xonotic/xonotic-data.pk3dir.git] / input-demoseeking.cfg

diff --git a/input-demoseeking.cfg b/input-demoseeking.cfg
index 45df74f223564da7c19369f7158363dd6ca1f681..b4250f06e6f9cdceadcde2acda8f51701c1259cf 100644 (file)
--- a/input-demoseeking.cfg
+++ b/input-demoseeking.cfg
@@ -1,32 +1,19 @@
-alias playdemo "set _demo_name \"$1\""
-set _demo_name ""
-set _demo_seeking 0
-set _demo_good 0
-set _demo_time_increasing 0
-set _demo_time 0
-set _demo_time_step 0
-alias seekdemo "_seekdemo_1_$_demo_seeking $1"
-alias _seekdemo_1_0 "cl_cmd rpn time dup        \"$1\" add dup /_demo_time exch def le /_demo_time_increasing exch def; _seekdemo_2"
-alias _seekdemo_1_1 "cl_cmd rpn time _demo_time \"$1\" add dup /_demo_time exch def le /_demo_time_increasing exch def; _seekdemo_2"
-alias _seekdemo_2 "_demo_seeking 1; r_render 0; snd_startnonloopingsounds 0; _seekdemo_3_$_demo_time_increasing"
-alias _seekdemo_3_0 "playdemo \"$_demo_name\"; _seekdemo_4; defer 10 _seekdemo_9_2"
-alias _seekdemo_3_1 "_seekdemo_7"
-alias _seekdemo_4 "set _demo_good 0; cl_cmd rpn /_demo_good 1 def; _seekdemo_5"
-alias _seekdemo_5 "_seekdemo_6_$_demo_good"
-alias _seekdemo_6_0 "defer 0.001 _seekdemo_4"
-alias _seekdemo_6_1 "defer clear; _seekdemo_7"
-alias _seekdemo_7 "set _demo_time_step 2; cl_cmd rpn _demo_time time gt /_demo_time_step exch def; _seekdemo_8"
-alias _seekdemo_8 "_seekdemo_9_$_demo_time_step"
-alias _seekdemo_9_0 "slowmo 1; set _demo_seeking 0; r_render 1; snd_startnonloopingsounds 1"
-alias _seekdemo_9_1 "cl_cmd rpn _demo_time time sub 10 mul 1 add /slowmo exch def; defer 0.001 _seekdemo_7"
-alias _seekdemo_9_2 "slowmo 1; set _demo_seeking 0; r_render 1; snd_startnonloopingsounds 1; echo SEEK FAILED"
+//
+// Make sure to follow the setup in demoseeking.cfg.
+//
+// This script loads demoseeking.cfg with the original bindings:
+//
+//     * ,. (comma and dot) keys to seek -5/+5 seconds
+//     * m/ (m and slash) keys to seek -30/+30 seconds
+//     * - (minus) also works instead of slash
+//
+// To use demoseeking without these bindings, do `exec demoseeking.cfg`
+// instead.
+
+exec demoseeking.cfg
+
 bind , "seekdemo -5"
 bind . "seekdemo +5"
 bind m "seekdemo -30"
 bind - "seekdemo +30"
 bind / "seekdemo +30"
-
-// Usage:
-//   start a demo
-//   use ,. keys to seek -5/+5 seconds
-//   use m/ keys (left/right of ,.) to seek -30/+30 seconds