git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added #defines for TRUE/FALSE (rfxswf.h), and tell jpeglib that we
[swftools.git]
/
src
/
combine.c
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();