Issue #501: GotoFrame2 fix, telltarget misc

This commit is contained in:
Jindra Petřík
2014-06-08 14:04:39 +02:00
parent 7865d4090b
commit 0d57f0b430
2 changed files with 7 additions and 2 deletions

View File

@@ -76,7 +76,7 @@ public class GotoFrame2ActionItem extends ActionItem {
@Override
public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
if (!sceneBiasFlag && (frame instanceof DirectValueActionItem) && (((DirectValueActionItem) frame).value instanceof Long)) {
return toSourceMerge(localData, generator, frame, new ActionGotoFrame((int) ((long) (Long) ((DirectValueActionItem) frame).value) - 1), playFlag ? new ActionPlay() : null);
return toSourceMerge(localData, generator, new ActionGotoFrame((int) ((long) (Long) ((DirectValueActionItem) frame).value) - 1), playFlag ? new ActionPlay() : null);
} else {
return toSourceMerge(localData, generator, frame, new ActionGotoFrame2(playFlag, sceneBiasFlag, sceneBias));
}

View File

@@ -53,7 +53,7 @@ public class TellTargetActionItem extends ActionItem {
writer.append("{").newLine();
writer.indent();
for (GraphTargetItem ti : commands) {
ti.toString(writer, localData).newLine();
ti.toStringSemicoloned(writer, localData).newLine();
}
writer.unindent();
return writer.append("}");
@@ -80,6 +80,11 @@ public class TellTargetActionItem extends ActionItem {
return ret;
}
@Override
public boolean needsSemicolon() {
return false;
}
@Override
public boolean hasReturnValue() {
return false;