From ff002abfd1088ec03160db56d48bfa58b86db38b Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Fri, 12 Nov 2004 12:38:40 +0000
Subject: [PATCH] fixed -f.

---
 src/swfcombine.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 6fcbe64..d52aa71 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -666,7 +666,7 @@ 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;
@@ -694,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))
@@ -737,7 +745,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;
+		deletedepth = 65535;
 		if(config.clip) {
 		    msg("<fatal> Can't combine --clip and --frame");
 		}
@@ -779,11 +787,6 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 		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;
-- 
1.7.10.4