fly/fgdata
1
0
Fork 0
Code Activity

Correct waiting period for exit statements without conditions,

Browse source 
update tutorial README with <wait> tag.
This commit is contained in:
Stuart Buchanan 2012-07-14 20:27:31 +01:00
parent 359a8ce414
commit bd4e8764de
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Docs/README.tutorials
View file

@ -38,10 +38,13 @@ in detail below:
tutorial selection dialog tutorial selection dialog
<description>...</description> mandatory; longer description for the dialog <description>...</description> mandatory; longer description for the dialog
<audio-dir>...</audio-dir> optional; defines where to load sound samples <audio-dir>...</audio-dir> optional; defines where to load sound samples
<interval>5</interval> optional; defines default loop interval in sec
<timeofday>noon</timeofday> optional; defines daytime; any of "dawn", <timeofday>noon</timeofday> optional; defines daytime; any of "dawn",
"morning", "noon", "afternoon", "morning", "noon", "afternoon",
"evening", "dusk", "midnight", "real" "evening", "dusk", "midnight", "real"
<step-time> optional; period between each step being executed. Default 5
<exit-time> optional; period between exit/abort conditions being checked. Default 1
<nasal> <nasal>
... optional; initial Nasal code; see below ... optional; initial Nasal code; see below
</nasal> </nasal>
@ -72,10 +75,7 @@ in detail below:
<nasal> <nasal>
... optional; Nasal code ... optional; Nasal code
</nasal> </nasal>
<interval>10</interval> optional; run loop next in this many seconds </init>
</init> (default: 5); doesn't change global
interval
<step> mandatory; well, not really, but if there's not <step> mandatory; well, not really, but if there's not
at least one <step>, then the whole tutorial at least one <step>, then the whole tutorial
@ -100,7 +100,7 @@ in detail below:
... optional; Nasal code that is executed when the ... optional; Nasal code that is executed when the
</nasal> step is entered </nasal> step is entered
<interval>10</interval> optional; run loop next in this many seconds <wait>10</wait> optional; wait period after initial messages etc.
<error> optional; allowed several times <error> optional; allowed several times
<message>..</message> optional; text displayed/spoken <message>..</message> optional; text displayed/spoken
@ -113,8 +113,6 @@ in detail below:
<nasal> <nasal>
... optional; Nasal code that is executed when the ... optional; Nasal code that is executed when the
</nasal> error condition was fulfilled </nasal> error condition was fulfilled
<interval>10</interval> optional; run loop next in this many seconds
</error> </error>
<exit> optional; defines when to leave this <step> <exit> optional; defines when to leave this <step>

2
Nasal/tutorial/tutorial.nas
View file

@ -203,7 +203,7 @@ var step_tutorial = func(id) {
step_start_time = time_elapsedN.getValue(); step_start_time = time_elapsedN.getValue();
do_group(step, "Tutorial step " ~ current_step); do_group(step, "Tutorial step " ~ current_step);
} }
return continue_after(exit, exit_interval); return continue_after(exit, step_interval);
} }
do_group(exit); do_group(exit);