diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java index fc9a9aa67..5235ec339 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.flash.helpers.NulWriter; @@ -64,6 +65,11 @@ public class NewFunctionAVM2Item extends AVM2Item { writer.appendNoHilight("("); methodInfo.get(methodIndex).getParamStr(writer, constants, body, abc, fullyQualifiedNames); writer.appendNoHilight("):"); + if (Configuration.showMethodBodyId.get()) { + writer.appendNoHilight("// method body id: "); + writer.appendNoHilight(abc.findBodyIndex(methodIndex)); + writer.newLine(); + } methodInfo.get(methodIndex).getReturnTypeStr(writer, constants, fullyQualifiedNames); writer.endMethod(); writer.startBlock(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index 9661a75b5..03b0cf049 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.ValueKind; +import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.flash.helpers.NulWriter; @@ -100,6 +101,11 @@ public class TraitSlotConst extends Trait implements TraitWithSlot { int initMethod = abc.class_info.get(tc.class_info).cinit_index; writer.startTrait(traitInitId); writer.startMethod(initMethod); + if (Configuration.showMethodBodyId.get()) { + writer.appendNoHilight("// method body id: "); + writer.appendNoHilight(abc.findBodyIndex(initMethod)); + writer.newLine(); + } } assignedValue.toString(writer, LocalData.create(abc.constants, new HashMap(), fullyQualifiedNames)); if (parent instanceof TraitClass) {