From 2b86512fc0a47a30324a2cd2d61362000c8917b1 Mon Sep 17 00:00:00 2001 From: kramm Date: Fri, 30 Nov 2001 09:29:30 +0000 Subject: [PATCH] don't report an "Didn't find object %s in file" error if --dummy option is given --- src/combine.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/combine.c b/src/combine.c index 7b7423c..ebe89be 100644 --- a/src/combine.c +++ b/src/combine.c @@ -430,8 +430,10 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave if (spriteid<0) { - if(slavename) - logf(" Didn't find anything named %s in file. No substitutions will occur.", slavename); + if(slavename) { + if(strcmp(slavename,"!!dummy!!")) + logf(" Didn't find anything named %s in file. No substitutions will occur.", slavename); + } else logf(" Didn't find id %d in file. No substitutions will occur.", slaveid); spriteid = get_free_id(); -- 1.7.10.4