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, 2 insertions, 1 deletions

diff --git a/src/animationparticle.h b/src/animationparticle.h
index 6c1975710..984d3dc14 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -36,7 +36,8 @@ class AnimationParticle : public ImageParticle
     public:
         AnimationParticle(Map *map, Animation *animation);
 
-        AnimationParticle(Map *map, xmlNodePtr animationNode);
+        AnimationParticle(Map *map, xmlNodePtr animationNode,
+                          const std::string& dyePalettes = std::string());
 
         ~AnimationParticle();