git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6569de8
)
don't report an "Didn't find object %s in file" error if --dummy option
author
kramm
<kramm>
Fri, 30 Nov 2001 09:29:30 +0000
(09:29 +0000)
committer
kramm
<kramm>
Fri, 30 Nov 2001 09:29:30 +0000
(09:29 +0000)
is given
src/combine.c
patch
|
blob
|
history
diff --git
a/src/combine.c
b/src/combine.c
index
7b7423c
..
ebe89be
100644
(file)
--- 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 (spriteid<0)
{
- if(slavename)
- logf("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+ if(slavename) {
+ if(strcmp(slavename,"!!dummy!!"))
+ logf("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+ }
else
logf("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
spriteid = get_free_id();
else
logf("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
spriteid = get_free_id();