Make use of the new available colors

This patch lets all being derivatives use the palette to set their
name's colors. Text Particle Effects all respect the new settings. Some
widgets were updated to use the colors.

1 files changed, 5 insertions, 12 deletions

diff --git a/src/particle.cpp b/src/particle.cpp
index 8bc764ba..e56435ed 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -325,12 +325,10 @@ Particle* Particle::addEffect(const std::string &particleEffectFile,
     return newParticle;
 }
 
-Particle *Particle::addTextSplashEffect(const std::string &text,
-                                        int colorR, int colorG, int colorB,
-                                        gcn::Font *font, int x, int y, bool outline)
+Particle *Particle::addTextSplashEffect(const std::string &text, int x, int y,
+        const gcn::Color *color, gcn::Font *font, bool outline)
 {
-    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
-                                             font, outline);
+    Particle *newParticle = new TextParticle(mMap, text, color, font, outline);
     newParticle->moveTo(x, y);
     newParticle->setVelocity(((rand() % 100) - 50) / 200.0f,    // X
                              ((rand() % 100) - 50) / 200.0f,    // Y
@@ -346,13 +344,8 @@ Particle *Particle::addTextSplashEffect(const std::string &text,
 }
 
 Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
-                                             gcn::Font *font,
-                                             int x, int y,
-                                             int colorR, int colorG,
-                                             int colorB, bool outline)
-{
-    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
-                                             font, outline);
+        int x, int y, const gcn::Color *color, gcn::Font *font, bool outline){
+    Particle *newParticle = new TextParticle(mMap, text, color, font, outline);
     newParticle->moveTo(x, y);
     newParticle->setVelocity(0.0f, 0.0f, 0.5f);
     newParticle->setGravity(0.0015f);