X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=94bc2d14345f6a85c149d26c3cf3ea71e1efa90d;hb=41bd31f149ef809065ab195a77247f1196fbf73e;hp=3accbfb1cd4bf6071d91ca354a34aa97c736db89;hpb=137aac41ff5320e6689df0d4448e6cecec5be6b3;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 3accbfb..94bc2d1 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -1176,6 +1176,20 @@ int main (int argc,char ** argv)
         else if(tag->id == ST_FREECHARACTER) {
             printf(" frees object %04d", swf_GetPlaceID(tag));
         }
+        else if(tag->id == ST_DOABC) {
+            swf_SetTagPos(tag, 0);
+            U32 flags = swf_GetU32(tag);
+            char*s = swf_GetString(tag);
+            if(*s) {
+                printf(" \"%s\"", s);
+            }
+            if(flags&1) {
+                if(name)
+                    printf(",");
+                printf(" lazy load");
+            }
+            swf_SetTagPos(tag, 0);
+        }
 	else if(tag->id == ST_STARTSOUND) {
 	    U8 flags;
 	    U16 id;
@@ -1235,18 +1249,15 @@ int main (int argc,char ** argv)
 	    if(issprite) {spriteframe++; spriteframelabel = 0;}
 	    if(!issprite) {mainframe++; framelabel = 0;}
 	}
-
-	if(tag->id == ST_SETBACKGROUNDCOLOR) {
+        else if(tag->id == ST_SETBACKGROUNDCOLOR) {
 	    U8 r = swf_GetU8(tag);
 	    U8 g = swf_GetU8(tag);
 	    U8 b = swf_GetU8(tag);
-	    printf(" (%02x/%02x/%02x)\n",r,g,b);
+	    printf(" (%02x/%02x/%02x)",r,g,b);
 	}
 	else if(tag->id == ST_PROTECT) {
 	    if(tag->len>0) {
-		printf(" %s\n", swf_GetString(tag));
-	    } else {
-		printf("\n");
+		printf(" %s", swf_GetString(tag));
 	    }
 	}
 	else if(tag->id == ST_CSMTEXTSETTINGS) {
@@ -1266,10 +1277,11 @@ int main (int argc,char ** argv)
 		printf("unknown[%08x],", flags);
 	    float thickness = swf_GetFixed(tag);
 	    float sharpness = swf_GetFixed(tag);
-	    printf("s=%.2f,t=%.2f)\n", thickness, sharpness);
+	    printf("s=%.2f,t=%.2f)", thickness, sharpness);
 	    swf_GetU8(tag);
 	}
-	else if(tag->id == ST_DEFINEBITSLOSSLESS ||
+
+	if(tag->id == ST_DEFINEBITSLOSSLESS ||
 	   tag->id == ST_DEFINEBITSLOSSLESS2) {
 	    handleDefineBits(tag);
 	    printf("\n");
@@ -1352,7 +1364,7 @@ int main (int argc,char ** argv)
             actions = swf_ActionGet(tag);
             swf_DumpActions(actions, myprefix);
         }
-        else if(tag->id == ST_DOABC && action) {
+        else if((tag->id == ST_DOABC || tag->id == ST_RAWABC) && action) {
             swf_ReadABC(tag);
         }
         else if(tag->id == ST_DOINITACTION && action) {