fixed bug which caused sprite object to be invisible in some cases.
authorkramm <kramm>
Sun, 16 Dec 2001 02:34:45 +0000 (02:34 +0000)
committerkramm <kramm>
Sun, 16 Dec 2001 02:34:45 +0000 (02:34 +0000)
src/combine.c

index 02e714c..bcc511b 100644 (file)
@@ -367,7 +367,8 @@ void write_master(struct writer_t*w, int spriteid, int replaceddefine, int flags
                       should be discarded, too, as the object to insert 
                       isn't a sprite 
                     */
-                   if(spriteid>=0 && getidfromtag(&master.tags[pos]) == spriteid && !config.isframe)
+                   if(spriteid>=0 && getidfromtag(&master.tags[pos]) == spriteid && 
+                           !config.isframe && config.merge)
                        dontwrite = 1;
                break;
            }