LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 00:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1961 Characters can use characterId 0, PlaceObject can use depth 0

Browse Source 
Changed #1961 SoundStreamHead on main timeline is exported/imported with identifier "-1"
This commit is contained in:
Jindra Petřík
2023-02-12 11:43:05 +01:00
parent d2c15e4b60
commit aaa354804e
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+6 -6
View File
@@ -1017,7 +1017,7 @@ public class XFLConverter {
return layer;
}
private static int getLayerCount(ReadOnlyTagList tags) {
private static int getMaxDepth(ReadOnlyTagList tags) {
int maxDepth = 0;
for (Tag t : tags) {
if (t instanceof PlaceObjectTypeTag) {
@@ -2944,7 +2944,7 @@ public class XFLConverter {
index++;
}
int layerCount = getLayerCount(timelineTags);
int maxDepth = getMaxDepth(timelineTags);
List<Integer> clipFrameSplitters = new ArrayList<>();
List<PlaceObjectTypeTag> clipPlaces = new ArrayList<>();
@@ -2995,13 +2995,13 @@ public class XFLConverter {
clipPlaces.add(null);
Map<Integer, List<Integer>> depthToFramesList = new HashMap<>();
for (int d = layerCount; d >= 1; d--) {
for (int d = maxDepth; d >= 0; d--) {
depthToFramesList.put(d, new ArrayList<>());
for (int i = 0; i < frameCount; i++) {
depthToFramesList.get(d).add(i);
}
}
for (int d = layerCount; d >= 1; d--) {
for (int d = maxDepth; d >= 0; d--) {
for (int p = 0; p < clipPlaces.size() - 1; p++) {
PlaceObjectTypeTag po = clipPlaces.get(p);
@@ -3054,8 +3054,8 @@ public class XFLConverter {
}
}
int soundLayerIndex = layerCount;
layerCount++;
int soundLayerIndex = maxDepth;
maxDepth++;
convertSoundLayer(soundLayerIndex, timelineTags, files, writer);
writer.writeEndElement();
writer.writeEndElement();