From 045aa1a089fc49ab5b947d48c3a0d4c8b01452bc Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Sun, 16 Dec 2001 02:34:45 +0000
Subject: [PATCH] fixed bug which caused sprite object to be invisible in some
 cases.

---
 src/combine.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/combine.c b/src/combine.c
index 02e714c..bcc511b 100644
--- a/src/combine.c
+++ b/src/combine.c
@@ -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;
 	    }
-- 
1.7.10.4