Added a class for rendering of floating text

This is a header only-class that merges the textrendering of the
TextParticle and Text classes. It is done to reduce code duplication and
to prepare some color configuration gui.

1 files changed, 5 insertions, 19 deletions

diff --git a/src/text.cpp b/src/text.cpp
index e5e40235..c167701a 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,6 +26,8 @@
 #include "textmanager.h"
 
 #include "gui/gui.h"
+#include "gui/palette.h"
+#include "gui/textrenderer.h"
 
 int Text::mInstances = 0;
 
@@ -76,23 +78,9 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff)
 {
     graphics->setFont(boldFont);
 
-    // Text shadow
-    graphics->setColor(gcn::Color(0, 0, 0));
-    graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1,
-              gcn::Graphics::LEFT);
-
-    // Text outline
-    graphics->drawText(mText, mX - xOff + 1, mY - yOff,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff - 1, mY - yOff,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff, mY - yOff + 1,
-              gcn::Graphics::LEFT);
-    graphics->drawText(mText, mX - xOff, mY - yOff - 1,
-              gcn::Graphics::LEFT);
-
-    graphics->setColor(mColor);
-    graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
+    TextRenderer::renderText(graphics, mText,
+            mX - xOff, mY - yOff, gcn::Graphics::LEFT,
+            &mColor, boldFont, !mIsSpeech, true);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,
@@ -107,9 +95,7 @@ void FlashText::draw(gcn::Graphics *graphics, int xOff, int yOff)
     if (mTime)
     {
         if ((--mTime & 4) == 0)
-        {
             return;
-        }
     }
     Text::draw(graphics, xOff, yOff);
 }