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
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-06-22 21:47:53 +0200
commitba5b70974c5dfa0be3105e72a0a012455b28e7a9 (patch)
treeb79f9f46cc30eb2a1196b79392831af144fabc22 /src/animationparticle.cpp
parent852ff45c35c422b5264487669934b392a8657465 (diff)
downloadmana-ba5b70974c5dfa0be3105e72a0a012455b28e7a9.tar.gz
mana-ba5b70974c5dfa0be3105e72a0a012455b28e7a9.tar.bz2
mana-ba5b70974c5dfa0be3105e72a0a012455b28e7a9.tar.xz
mana-ba5b70974c5dfa0be3105e72a0a012455b28e7a9.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.
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 392dc4f4..eb97637c 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -30,9 +30,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))
{
}