| .. | .. |
|---|
| 285 | 285 | else |
|---|
| 286 | 286 | { |
|---|
| 287 | 287 | if (speaker != null) |
|---|
| 288 | | - System.err.println(speaker.GetFileRoot().name + " (not a command) : " + reader.line); |
|---|
| 288 | + System.err.println(speaker.GetFileRoot().name + " (speaking) : " + reader.line); |
|---|
| 289 | 289 | else |
|---|
| 290 | 290 | System.err.println("no speaker (not a command) : " + reader.line); |
|---|
| 291 | 291 | } |
|---|
| .. | .. |
|---|
| 412 | 412 | { |
|---|
| 413 | 413 | //path += "/" + Filename(readers[i].script); |
|---|
| 414 | 414 | ScriptReader reader = readers[i]; |
|---|
| 415 | | - path += Filename(readers[i].script) + "; duration=" + reader.duration + "; total=" + reader.totalduration + |
|---|
| 415 | + path += Filename(reader.script) + "; duration=" + reader.duration + "; total=" + reader.totalduration + |
|---|
| 416 | 416 | "; line#" + reader.linecount + ": " + reader.line; |
|---|
| 417 | 417 | if (reader.line != null && // sept 2014 |
|---|
| 418 | 418 | reader.line.startsWith("_")) |
|---|
| .. | .. |
|---|
| 488 | 488 | reader = readers[stack] = new ScriptReader(new BufferedReader(new FileReader(script)), reader.totalduration, /*0, 0, "",*/ script); |
|---|
| 489 | 489 | //duration = 0; // june 2014 |
|---|
| 490 | 490 | //linecount = 0; |
|---|
| 491 | | - //reader.script = script; |
|---|
| 491 | + reader.script = script; // oct 2014 |
|---|
| 492 | 492 | return; |
|---|
| 493 | 493 | } |
|---|
| 494 | 494 | if (command.equals("return")) // line.startsWith("; return")) |
|---|
| .. | .. |
|---|
| 1438 | 1438 | object.skip = false; |
|---|
| 1439 | 1439 | return; |
|---|
| 1440 | 1440 | } |
|---|
| 1441 | | - if (command.equals("skipmocap")) |
|---|
| 1441 | + if (command.equals("skipmocap") || command.equals("mocapskip")) // oct 2014 |
|---|
| 1442 | 1442 | { |
|---|
| 1443 | 1443 | object.skipmocap = true; |
|---|
| 1444 | 1444 | return; |
|---|
