X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=d52aa71102cab87c29f55c4342294e963fb02552;hb=2d3f354e192af54cf746ed08cb9195227795a069;hp=78af8395c6f4eb76eddb3a704c6e159e27ce028a;hpb=5f963ea2ff1243b25634bd380bbc0c0fe4c448ec;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 78af839..d52aa71 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -480,13 +480,19 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite)
 		    case ST_SETBACKGROUNDCOLOR:
 		       msg("<debug> deliberately ignoring BACKGROUNDCOLOR tag");
 		       break;
+		    case ST_SHOWFRAME:
+		       msg("<debug> deliberately ignoring SHOWFRAME tag");
+		       break;
+		    case ST_REFLEX:
+		       msg("<debug> deliberately ignoring REFLEX tag");
+		       break;
 		    case 40:
 		    case 49:
 		    case 51:
-		       msg("<notice> found tag %d. This is a Generator template, isn't it?", tag->id);
+		       msg("<notice> found tag %d. This is a Generator template, isn't it?", rtag->id);
 		       break;
 		    default:
-		       msg("<notice> funny tag: %d is neither defining nor sprite", tag->id);
+		       msg("<notice> funny tag: %d is neither defining nor sprite", rtag->id);
 		}
 	    }
 	}
@@ -660,9 +666,10 @@ static char tag_ok_for_slave(int id)
 TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefine, int flags)
 {
     int outputslave = 0;
-    int frame = 0;
+    int frame = 1;
     int sframe = 0;
     int slavewritten = 0;
+    int deletedepth = -1;
 
     TAG* rtag = master->firstTag;
     TAG* stag = slave->firstTag;
@@ -687,6 +694,14 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 	if(rtag->id == ST_SHOWFRAME)
 	{
 	    frame ++;
+	    tag = swf_InsertTag(tag, ST_SHOWFRAME);
+            if(deletedepth>=0) {
+                tag = swf_InsertTag(tag, ST_REMOVEOBJECT2);
+                swf_SetU16(tag, deletedepth);
+                deletedepth=-1;
+            }
+	    rtag = rtag->next;
+            continue;
 	}
 
 	if(swf_isDefiningTag(rtag) && (flags&FLAGS_WRITEDEFINES))
@@ -720,7 +735,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;
@@ -729,7 +744,8 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 	    if((flags&FLAGS_WRITESPRITE) && !slavewritten)
 	    {
 		int id = get_free_id(masterbitmap);
-		int depth = 0;
+		int depth = 65535;
+		deletedepth = 65535;
 		if(config.clip) {
 		    msg("<fatal> Can't combine --clip and --frame");
 		}
@@ -770,6 +786,7 @@ 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);
+		
 	    }
 	}
 	rtag = rtag->next;