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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/rotationalparticle.cpp b/src/rotationalparticle.cpp
index 8be11ee10..cd16ddf63 100644
--- a/src/rotationalparticle.cpp
+++ b/src/rotationalparticle.cpp
@@ -34,9 +34,10 @@ RotationalParticle::RotationalParticle(Map *map, Animation *animation):
 {
 }
 
-RotationalParticle::RotationalParticle(Map *map, xmlNodePtr animationNode):
+RotationalParticle::RotationalParticle(Map *map, xmlNodePtr animationNode,
+                                       const std::string& dyePalettes):
     ImageParticle(map, 0),
-    mAnimation(new SimpleAnimation(animationNode))
+    mAnimation(new SimpleAnimation(animationNode, dyePalettes))
 {
 }