setmr fix/typos

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6282 e016b1c5-ed68-44aa-a2f7-31cac88cffde

config/docs.cfg

@@ -177,6 +177,7 @@ docident [storesets] [Generates an alias (list) of the current values for the gi
 docargument [L] [the list of CVARs] [] [0];
 docargument [A] [the alias to store them in] [] [0];
 docexample [storesets "sensitivity hudgun fov" tmp] [Example result: stores "3.000 1 120" into alias "tmp".];
+docremark [Some idents cannot be stored via this command "(e.g. curname)", if an argument is given that cannot be used, the command will throw an error to notify you.];
 docsection [General]
 docident [addserver] [Adds a server to the list of server to query in the server list menu.];
 docargument [S] [the address of the server (hostname or IP)] [] [0];

config/on_quit.cfg

@@ -24,6 +24,7 @@ on_quit_aliases = [
   tmp_botskill
   tmp_cl
   tmp_cradius
+  tmp_ff
   tmp_gamma_list
   tmp_hex
   tmp_mode

config/scripts.cfg

@@ -366,22 +366,27 @@ gamemodes_list = [ TDM COOP DM SURV TSURV CTF PF BTDM BDM LSS OSOK TOSOK BOSOK H
 getmodeacr = [ result (at $gamemodes_list $gamemode) ]
 
 // setmr - Restart the current demo and fast forward to, a predefined minutes remaining.
+tmp_ff = 0
+
 setmr = [
-  if (watchingdemo) [
-    if (! (> $arg1 (- (div $gametimemaximum 60000) 1))) [
-      if (! (< $arg1 1)) [
-        tmp_mrem = (*f $arg1 60000)
-        add2alias mapstartonce [
-          tmp_svol = $soundvol
-          add2alias mapstartonce [ if (!= $soundvol $tmp_svol) [ soundvol $tmp_svol ] ] // Ensure that soundvol is reset to original setting
-          sleep (- (* $minutesremaining 60000) $tmp_mrem) [ gamespeed 100; soundvol $tmp_svol ]
-          soundvol 0
-          gamespeed 1000
-        ]
-        demo $_demofile
-      ] [ echo (c 3)Error: (c 1)setmr (c 5)requires a positive, non-zero argument. ]
-    ] [ echo (c 3)Error: (c 5) $arg1 is not a valid minutes remaining to skip to in this demo. ]
-  ] [ echo (c 3)Error: (c 5)You are not currently watching a demo. ]
+  if (! $tmp_ff) [
+    if (watchingdemo) [
+      if (! (> $arg1 (- (div $gametimemaximum 60000) 1))) [
+        if (! (< $arg1 1)) [
+          tmp_mrem = (*f $arg1 60000)
+          add2alias mapstartonce [
+            tmp_svol = $soundvol
+            add2alias mapstartonce [ if (!= $soundvol $tmp_svol) [ soundvol $tmp_svol ] ] // Ensure that soundvol is reset to original setting
+            sleep (- (* $minutesremaining 60000) $tmp_mrem) [ gamespeed 100; soundvol $tmp_svol; tmp_ff = 0 ]
+            soundvol 0
+            gamespeed 1000
+            tmp_ff = 1
+          ]
+          demo $_demofile
+        ] [ echo (c 3)Error: (c 1)setmr (c 5)requires a positive, non-zero argument. ]
+      ] [ echo (c 3)Error: (c 5) $arg1 is not a valid minutes remaining to skip to in this demo. ]
+    ] [ echo (c 3)Error: (c 5)You are not currently watching a demo. ]
+  ]
 ]
 
 // storesets - Generates an alias (list) of the current values for the given CVARs.

docs/reference.xml

@@ -677,7 +677,7 @@
             </example>
           </examples>
           <remarks>
-            <remark>Some idents cannot be stored via this command (e.g. curname), if an argument is given that cannot be used, the command will throw and error to notify you.</remark>
+            <remark>Some idents cannot be stored via this command (e.g. curname), if an argument is given that cannot be used, the command will throw an error to notify you.</remark>
           </remarks>
           <arguments>
             <argument token="L" description="the list of CVARs"/>