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

prepare for Issue #350 (Allow to open multiple SWF files into the same ffdec instance), some action commands moved to constants

Browse Source
This commit is contained in:
Honfika
2013-12-20 16:27:25 +01:00
parent 1516c7d0ad
commit 727d7a74e5
35 changed files with 660 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -1444,8 +1444,8 @@ public class SWFInputStream extends InputStream {
* @return CLIPACTIONRECORD value
* @throws IOException
*/
public CLIPACTIONRECORD readCLIPACTIONRECORD() throws IOException {
CLIPACTIONRECORD ret = new CLIPACTIONRECORD(this, version, getPos());
public CLIPACTIONRECORD readCLIPACTIONRECORD(SWF swf) throws IOException {
CLIPACTIONRECORD ret = new CLIPACTIONRECORD(swf, this, version, getPos());
if (ret.eventFlags.isClear()) {
return null;
}
@@ -1459,13 +1459,13 @@ public class SWFInputStream extends InputStream {
* @return CLIPACTIONS value
* @throws IOException
*/
public CLIPACTIONS readCLIPACTIONS() throws IOException {
public CLIPACTIONS readCLIPACTIONS(SWF swf) throws IOException {
CLIPACTIONS ret = new CLIPACTIONS();
readUI16();//reserved
ret.allEventFlags = readCLIPEVENTFLAGS();
CLIPACTIONRECORD cr;
ret.clipActionRecords = new ArrayList<>();
while ((cr = readCLIPACTIONRECORD()) != null) {
while ((cr = readCLIPACTIONRECORD(swf)) != null) {
ret.clipActionRecords.add(cr);
}
return ret;
@@ -1809,10 +1809,10 @@ public class SWFInputStream extends InputStream {
* @return List of BUTTONCONDACTION values
* @throws IOException
*/
public List<BUTTONCONDACTION> readBUTTONCONDACTIONList() throws IOException {
public List<BUTTONCONDACTION> readBUTTONCONDACTIONList(SWF swf) throws IOException {
List<BUTTONCONDACTION> ret = new ArrayList<>();
BUTTONCONDACTION bc;
while (!(bc = readBUTTONCONDACTION()).isLast) {
while (!(bc = readBUTTONCONDACTION(swf)).isLast) {
ret.add(bc);
}
ret.add(bc);
@@ -1825,8 +1825,8 @@ public class SWFInputStream extends InputStream {
* @return BUTTONCONDACTION value
* @throws IOException
*/
public BUTTONCONDACTION readBUTTONCONDACTION() throws IOException {
BUTTONCONDACTION ret = new BUTTONCONDACTION(this, version, getPos());
public BUTTONCONDACTION readBUTTONCONDACTION(SWF swf) throws IOException {
BUTTONCONDACTION ret = new BUTTONCONDACTION(swf, this, version, getPos());
//ret.actions = readActionList();
return ret;
}