Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 7 insertions, 26 deletions

diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 3494b97f..792b6bea 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -21,19 +21,17 @@
 
 #include <guichan/color.hpp>
 
-#include "graphics.h"
 #include "textparticle.h"
-#include <SDL/SDL_ttf.h>
+
+#include "gui/textrenderer.h"
 
 TextParticle::TextParticle(Map *map, const std::string &text,
-                           int colorR, int colorG, int colorB,
+                           const gcn::Color* color,
                            gcn::Font *font, bool outline):
     Particle(map),
     mText(text),
     mTextFont(font),
-    mColorR(colorR),
-    mColorG(colorG),
-    mColorB(colorB),
+    mColor(color),
     mOutline(outline)
 {
 }
@@ -60,24 +58,7 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
         alpha /= mFadeIn;
     }
 
-    graphics->setFont(mTextFont);
-    if (mOutline)
-    {
-        graphics->setColor(gcn::Color(0, 0, 0, (int)(alpha/4)));
-        // Text outline
-        graphics->setColor(gcn::Color(0, 0, 0, (int)alpha));
-        graphics->drawText(mText, screenX + 1, screenY,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX - 1, screenY,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX, screenY + 1,
-                gcn::Graphics::CENTER);
-
-        graphics->drawText(mText, screenX, screenY - 1,
-                gcn::Graphics::CENTER);
-    }
-    graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, (int)alpha));
-    graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
+    TextRenderer::renderText(graphics, mText,
+            screenX, screenY, gcn::Graphics::CENTER,
+            mColor, mTextFont, mOutline, false, (int)alpha);
 }