LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-27 05:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

move new character tags to appropriate location

Browse Source
This commit is contained in:
honfika@gmail.com
2014-11-07 20:24:25 +01:00
parent da5b8080ba
commit 7323ce4545
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -285,7 +285,36 @@ public final class SWF implements SWFContainerItem, Timelined {
return max + 1;
}
public void fixCharactersOrder(boolean checkAll) {
Set<Integer> addedCharacterIds = new HashSet<>();
Set<CharacterTag> movedTags = new HashSet<>();
for (int i = 0; i < tags.size(); i++) {
Tag tag = tags.get(i);
if (checkAll || tag.isModified()) {
Set<Integer> needed = new HashSet<>();
tag.getNeededCharacters(needed);
for (Integer id : needed) {
if (!addedCharacterIds.contains(id)) {
CharacterTag neededCharacter = characters.get(id);
if (movedTags.contains(neededCharacter)) {
logger.log(Level.SEVERE, "Fixing characters order failed, recursion detected.");
return;
}
// move the needed character to the current position
tags.remove(neededCharacter);
tags.add(i, neededCharacter);
movedTags.add(neededCharacter);
}
}
}
if (tag instanceof CharacterTag) {
addedCharacterIds.add(((CharacterTag) tag).getCharacterId());
}
}
}
public void resetTimelines(Timelined timelined) {
timelined.getTimeline().reset();
for (Tag t : timelined.getTimeline().tags) {
@@ -402,6 +431,8 @@ public final class SWF implements SWFContainerItem, Timelined {
*/
public void saveTo(OutputStream os, SWFCompression compression) throws IOException {
try {
fixCharactersOrder(false);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
SWFOutputStream sos = new SWFOutputStream(baos, version);
sos.writeRECT(displayRect);