X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fswfcombine.c;h=6fcbe64ceab7382ec567615dbbb605683870eec4;hb=6b92e9496d0ed61b9619565ac0888bd0e3522ae2;hp=136ac79445e0c7484b80cfea9a7e970a00a72310;hpb=8af73868efc8821ce2ab97472fc8ebe5ad63f585;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 136ac79..6fcbe64 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -669,6 +669,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
     int frame = 0;
     int sframe = 0;
     int slavewritten = 0;
+    int deletedepth = -1;
 
     TAG* rtag = master->firstTag;
     TAG* stag = slave->firstTag;
@@ -726,7 +727,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 		swf_SetBlock(tag, rtag->data, rtag->len);
 	    }
 	}
-	if(frame == slaveframe)
+	if(frame == slaveframe) /* only happens with config.isframe: put slave at specific frame */
 	{
 	    if(flags&FLAGS_WRITESLAVE) {
 		outputslave = 1;
@@ -736,6 +737,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 	    {
 		int id = get_free_id(masterbitmap);
 		int depth = 65535;
+		deletedepth = 65536;
 		if(config.clip) {
 		    msg("<fatal> Can't combine --clip and --frame");
 		}
@@ -776,6 +778,12 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 			rtag->id, rtag->len);
 		tag = swf_InsertTag(tag, rtag->id);
 		write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1);
+		
+		if(rtag->id == ST_SHOWFRAME && deletedepth) {
+		    tag = swf_InsertTag(tag, ST_REMOVEOBJECT2);
+		    swf_SetU16(tag, deletedepth);
+		    deletedepth = -1;
+		}
 	    }
 	}
 	rtag = rtag->next;