summaryrefslogtreecommitdiff
path: root/src/animationparticle.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 21:47:53 +0200
committerAndrei Karas <akaras@inbox.ru>2011-06-23 12:46:37 +0300
commit99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1 (patch)
treee6dc5588927460dbda4dccb002fb1e9c48823088 /src/animationparticle.cpp
parent493cc14facb80c6c86c57ef379131e56a0161215 (diff)
downloadmv-99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1.tar.gz
mv-99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1.tar.bz2
mv-99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1.tar.xz
mv-99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1.zip
Made possible to separate the dye colors and channels
for particle effects. It is now possible to write, for instance: <particlefx>my-particle-file.xml|#cbcb78,345678</particlefx> and in my-particle-file.xml: ... <property image="my-image.png|W" /> ... This will permit the use (and reuse) of generic particle files. Conflicts: src/particle.cpp src/particleemitter.cpp src/particleemitter.h src/simpleanimation.cpp
Diffstat (limited to 'src/animationparticle.cpp')
-rw-r--r--src/animationparticle.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
index fbe0e29df..b20625a42 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -33,9 +33,10 @@ AnimationParticle::AnimationParticle(Map *map, Animation *animation):
{
}
-AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode):
+AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode,
+ const std::string& dyePalettes):
ImageParticle(map, 0),
- mAnimation(new SimpleAnimation(animationNode))
+ mAnimation(new SimpleAnimation(animationNode, dyePalettes))
{
}