From e1752ee77f9bc5529aa551fe89ded25d879d0119 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Sun, 16 Dec 2001 01:09:11 +0000
Subject: [PATCH] getidfromtag now also handles the displaylist tags
 (removeobject, placeobject)

---
 src/flash.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/flash.c b/src/flash.c
index f24b834..289dcbb 100644
--- a/src/flash.c
+++ b/src/flash.c
@@ -494,7 +494,28 @@ int spritetagids[] =
 
 int getidfromtag(struct swf_tag* tag)
 {
-    // todo: check for more than one id
+    int num = 1;
+    switch(tag->id) {
+	case TAGID_PLACEOBJECT2:
+	    num++;
+	case TAGID_PLACEOBJECT:
+	   reader_init (tag->data, tag->length);
+	   if(num>=2) {
+		char b = readu8();
+		if(!(b&2))
+		    return -1;
+	   }
+	   readu16();
+	   return readu16();
+	break;
+	case TAGID_REMOVEOBJECT:
+	   return *(u16*)tag->data;
+	break;
+	case TAGID_REMOVEOBJECT2:
+	   return -1;
+	break;
+    }
+
     return *(u16*)tag->data;
 }
 
-- 
1.7.10.4