Handling script traits as separate objects

This commit is contained in:
Jindra Petk
2013-05-05 17:22:04 +02:00
parent 77703cc395
commit c447f3b721
9 changed files with 173 additions and 97 deletions

View File

@@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash;
import SevenZip.Compression.LZMA.Encoder;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.gui.TreeLeafScript;
import com.jpexs.decompiler.flash.abc.ScriptPack;
import com.jpexs.decompiler.flash.abc.types.traits.Trait;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.ActionGraphSource;
@@ -415,16 +415,15 @@ public class SWF {
}
for (int i = 0; i < abcTags.size(); i++) {
ABC abc = abcTags.get(i).getABC();
TreeLeafScript scr = abc.findScriptTraitByPath(className);
ScriptPack scr = abc.findScriptTraitByPath(className);
if (scr != null) {
String cnt = "";
if (abc.script_info.length > 1) {
cnt = "script " + (i + 1) + "/" + abc.script_info.length + " ";
}
Trait t = abc.script_info[scr.scriptIndex].traits.traits[scr.traitIndex];
String exStr = "Exporting " + "tag " + (i + 1) + "/" + abcTags.size() + " " + cnt + t.getPath(abc) + " ...";
String exStr = "Exporting " + "tag " + (i + 1) + "/" + abcTags.size() + " " + cnt + scr.getPath() + " ...";
informListeners("export", exStr);
t.export(outdir, abc, abcTags, isPcode, scr.scriptIndex, -1, false);
scr.export(outdir, abcTags, isPcode);
return true;
}
}