From 99cb204d29a63bf5f4edb40b25f4fc1a6605fbd1 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Wed, 22 Jun 2011 21:47:53 +0200
Subject: 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
---
 src/rotationalparticle.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/rotationalparticle.h')

diff --git a/src/rotationalparticle.h b/src/rotationalparticle.h
index d7b126f76..d5b91bc63 100644
--- a/src/rotationalparticle.h
+++ b/src/rotationalparticle.h
@@ -36,7 +36,8 @@ class RotationalParticle : public ImageParticle
     public:
         RotationalParticle(Map *map, Animation *animation);
 
-        RotationalParticle(Map *map, xmlNodePtr animationNode);
+        RotationalParticle(Map *map, xmlNodePtr animationNode,
+                           const std::string& dyePalettes = std::string());
 
         ~RotationalParticle();
 
-- 
cgit v1.2.3-60-g2f50