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 additional zoom type
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
a1437c1
..
25698ee
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-1022,8
+1022,12
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
if (spriteid<0 && !config.isframe) {
if(slavename) {
if (spriteid<0 && !config.isframe) {
if(slavename) {
- if(strcmp(slavename,"!!dummy!!"))
+ if(strcmp(slavename,"!!dummy!!")) {
msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+ if(!strcmp(slavename, "swf")) {
+ msg("<warning> (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'.");
+ }
+ }
}
else
msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
}
else
msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
@@
-1062,7
+1066,7
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE );
}
FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE );
}
- swf_DeleteTag(newswf, tag);
+ swf_DeleteTag(newswf, newswf->firstTag);
}
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
}
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)