From 53c32dd1beb5575c38bbc830f7d37cb954be90d2 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 14 May 2009 19:08:25 +0200
Subject: Fixed alpha to also apply to the main text of a text particle

It was only being applied to the outline and shadow. This improves the
fadeout a little, but because the text is being rendered multiple times,
it still looks strange.

(cherry picked from commit 3591c264f14edf300e7d3ea20577c517a092cf50)
---
 src/textparticle.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/textparticle.cpp')

diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 04b7abe1..da176087 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -26,7 +26,7 @@
 #include "gui/textrenderer.h"
 
 TextParticle::TextParticle(Map *map, const std::string &text,
-                           const gcn::Color* color,
+                           const gcn::Color *color,
                            gcn::Font *font, bool outline):
     Particle(map),
     mText(text),
@@ -47,18 +47,15 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     float alpha = mAlpha * 255.0f;
 
     if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
-    {
-        alpha *= mLifetimeLeft;
-        alpha /= mFadeOut;
-    }
+        alpha = alpha * mLifetimeLeft / mFadeOut;
 
     if (mLifetimePast < mFadeIn)
-    {
-        alpha *= mLifetimePast;
-        alpha /= mFadeIn;
-    }
+        alpha = alpha * mLifetimePast / mFadeIn;
+
+    gcn::Color color = *mColor;
+    color.a = (int) alpha;
 
     TextRenderer::renderText(graphics, mText,
             screenX, screenY, gcn::Graphics::CENTER,
-            *mColor, mTextFont, mOutline, false, (int) alpha);
+            color, mTextFont, mOutline, false, (int) alpha);
 }
-- 
cgit v1.2.3-70-g09d2