LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-17 15:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Character tag removing simplified/fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2016-12-13 12:46:53 +01:00
parent b7ab24b0a5
commit a44221b363
7 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2762,21 +2762,8 @@ public final class SWF implements SWFContainerItem, Timelined {
ReadOnlyTagList tags = timelined.getTags();
if (toRemove instanceof CharacterTag) {
int characterId = ((CharacterTag) toRemove).getCharacterId();
if (characterId != 0) {
dependingChars.add(characterId);
for (int i = 0; i < tags.size(); i++) {
Tag t = tags.get(i);
if (t instanceof CharacterIdTag) {
CharacterIdTag c = (CharacterIdTag) t;
Set<Integer> needed = new HashSet<>();
t.getNeededCharacters(needed);
if (needed.contains(characterId)) {
dependingChars.add(c.getCharacterId());
}
}
}
}
dependingChars = getDependentCharacters(characterId);
dependingChars.add(characterId);
}
for (int i = 0; i < tags.size(); i++) {
@@ -2794,19 +2781,24 @@ public final class SWF implements SWFContainerItem, Timelined {
}
}
}
if (t instanceof PlaceObjectTypeTag) {
PlaceObjectTypeTag po = (PlaceObjectTypeTag) t;
int placeCharId = po.getCharacterId();
int depth = po.getDepth();
if (placeCharId != 0) {
if (placeCharId >= 0) {
stage.put(depth, placeCharId);
if (dependingChars.contains(placeCharId)) {
timelined.removeTag(i);
i--;
continue;
}
} else if (stage.containsKey(depth)) {
placeCharId = stage.get(depth);
}
if (placeCharId >= 0 && dependingChars.contains(placeCharId)) {
timelined.removeTag(i);
i--;
continue;
}
}
if (t instanceof CharacterIdTag) {
CharacterIdTag c = (CharacterIdTag) t;
if (dependingChars.contains(c.getCharacterId())) {
@@ -2815,20 +2807,13 @@ public final class SWF implements SWFContainerItem, Timelined {
continue;
}
}
Set<Integer> needed = new HashSet<>();
t.getNeededCharacters(needed);
for (int dep : dependingChars) {
if (needed.contains(dep)) {
timelined.removeTag(i);
i--;
//continue;
}
}
if (t == toRemove) {
timelined.removeTag(i);
i--;
continue;
}
if (t instanceof Timelined) {
removeTagWithDependenciesFromTimeline(toRemove, ((Timelined) t).getTimeline());
}
@@ -2916,7 +2901,8 @@ public final class SWF implements SWFContainerItem, Timelined {
timelined.setModified(true);
timelined.resetTimeline();
} else // timeline should be always the swf here
if (removeDependencies) {
{
if (removeDependencies) {
removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
timelined.setModified(true);
} else {
@@ -2925,6 +2911,7 @@ public final class SWF implements SWFContainerItem, Timelined {
timelined.setModified(true);
}
}
}
}
@Override

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/iggy/streams/SeekMode.java
View File

@@ -2,7 +2,7 @@ package com.jpexs.decompiler.flash.iggy.streams;
/**
*
* @author Jindra
* @author JPEXS
*/
public enum SeekMode {
SET, CUR, END

11
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java
View File

@@ -158,7 +158,7 @@ public class PlaceObject2Tag extends PlaceObjectTypeTag implements ASMSourceCont
this.placeFlagHasRatio = ratio >= 0;
this.placeFlagHasColorTransform = colorTransform != null;
this.placeFlagHasMatrix = matrix != null;
this.placeFlagHasCharacter = characterId > 0;
this.placeFlagHasCharacter = characterId >= 0;
this.placeFlagMove = placeFlagMove;
this.depth = depth;
this.characterId = characterId;
@@ -317,8 +317,13 @@ public class PlaceObject2Tag extends PlaceObjectTypeTag implements ASMSourceCont
@Override
public void setCharacterId(int characterId) {
placeFlagHasCharacter = true;
this.characterId = characterId;
if (characterId >= 0) {
placeFlagHasCharacter = true;
this.characterId = characterId;
} else {
placeFlagHasCharacter = false;
this.characterId = -1;
}
}
@Override

9
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java
View File

@@ -486,8 +486,13 @@ public class PlaceObject3Tag extends PlaceObjectTypeTag implements ASMSourceCont
@Override
public void setCharacterId(int characterId) {
placeFlagHasCharacter = true;
this.characterId = characterId;
if (characterId >= 0) {
placeFlagHasCharacter = true;
this.characterId = characterId;
} else {
placeFlagHasCharacter = false;
this.characterId = -1;
}
}
@Override

9
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/PlaceObject4Tag.java
View File

@@ -507,8 +507,13 @@ public class PlaceObject4Tag extends PlaceObjectTypeTag implements ASMSourceCont
@Override
public void setCharacterId(int characterId) {
placeFlagHasCharacter = true;
this.characterId = characterId;
if (characterId >= 0) {
placeFlagHasCharacter = true;
this.characterId = characterId;
} else {
placeFlagHasCharacter = false;
this.characterId = -1;
}
}
@Override