X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcombine.c;h=9a033cb7ef8137bbfeac7c78983b4ce63689a67d;hb=b8c209af4894200c05bd897c624a4507fde8c066;hp=fa3c89425db027a92afd9ceda421615e7e79ca01;hpb=1e33565b4a202a89b2aee42a5bdc19e5ad4b47cd;p=swftools.git

diff --git a/src/combine.c b/src/combine.c
index fa3c894..9a033cb 100644
--- a/src/combine.c
+++ b/src/combine.c
@@ -84,7 +84,7 @@ void jpeg_assert()
 	pos++;
     }
     pos = 0;
-    while(master.tags[pos].id != 0)
+    while(slave.tags[pos].id != 0)
     {
 	if(slave.tags[pos].id == TAGID_JPEGTABLES)
 	    spos = pos;
@@ -249,9 +249,9 @@ void write_sprite(struct writer_t*w, int spriteid, int replaceddefine)
     startpos = (u8*)writer_getpos(w);
 
     logf ("<notice> sprite id is %d", spriteid);
-    tmp = spriteid;
+    tmp = SWAP16(spriteid);
     writer_write(w, &tmp, 2);
-    tmp = slave.header.count;
+    tmp = SWAP16(slave.header.count);
     writer_write(w, &tmp, 2);
 
 
@@ -581,7 +581,7 @@ uchar * normalcombine(uchar*masterdata, int masterlength, char*_slavename, uchar
 	int spriteid = -1;
 	int replaceddefine = -1;
 	struct writer_t w;
-	int frame;
+	int frame = 0;
 	char*framelabel;
 	
 	length = masterlength + slavelength*2 + 128; // this is a guess, but a good guess.
@@ -701,8 +701,8 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave
 
     logf("<debug> move x (%d)", config.movex);
     logf("<debug> move y (%d)", config.movey);
-    logf("<debug> scale x (%d)", config.scalex);
-    logf("<debug> scale y (%d)", config.scaley);
+    logf("<debug> scale x (%f)", config.scalex);
+    logf("<debug> scale y (%f)", config.scaley);
     logf("<debug> is frame (%d)", config.isframe);
     
     memset(masterids, -1, sizeof(masterids));