1 files changed, 103 insertions, 17 deletions

diff --git a/src/text.cpp b/src/text.cpp
index c0cd1ecc..0e458c9f 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -25,23 +25,52 @@
 
 #include <guichan/font.hpp>
 
+#include "configuration.h"
 #include "textmanager.h"
+#include "resources/resourcemanager.h"
+#include "resources/image.h"
 
-int Text::mInstances = 0;
+#include "gui/gui.h"
 
+int Text::mInstances = 0;
+ImageRect Text::mBubble;
+Image *Text::mBubbleArrow;
 
 Text::Text(const std::string &text, int x, int y,
-           gcn::Graphics::Alignment alignment, gcn::Font *font,
-           gcn::Color colour) :
-    mText(text), mColour(colour)
+           gcn::Graphics::Alignment alignment,
+           gcn::Color colour, bool isSpeech) :
+    mText(text),
+    mColour(colour),
+    mIsSpeech(isSpeech)
 {
     if (textManager == 0)
     {
-        textManager = new TextManager();
+        textManager = new TextManager;
+        ResourceManager *resman = ResourceManager::getInstance();
+        Image *sbImage = resman->getImage("graphics/gui/bubble.png|W:#"
+            + config.getValue("speechBubbleColour", "000000"));
+        mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5);
+        mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5);
+        mBubble.grid[2] = sbImage->getSubImage(10, 0, 5, 5);
+        mBubble.grid[3] = sbImage->getSubImage(0, 5, 5, 5);
+        mBubble.grid[4] = sbImage->getSubImage(5, 5, 5, 5);
+        mBubble.grid[5] = sbImage->getSubImage(10, 5, 5, 5);
+        mBubble.grid[6] = sbImage->getSubImage(0, 10, 5, 5);
+        mBubble.grid[7] = sbImage->getSubImage(5, 10, 5, 5);
+        mBubble.grid[8] = sbImage->getSubImage(10, 10, 5, 5);
+        mBubbleArrow = sbImage->getSubImage(0, 15, 15, 10);
+        const float bubbleAlpha = config.getValue("speechBubbleAlpha", 1.0);
+        for (int i = 0; i < 9; i++)
+        {
+             mBubble.grid[i]->setAlpha(bubbleAlpha);
+        }
+        mBubbleArrow->setAlpha(bubbleAlpha);
+        sbImage->decRef();
     }
     ++mInstances;
-    mHeight = font->getHeight();
-    mWidth = font->getWidth(text);
+    mHeight = gui->getFont()->getHeight();
+    mWidth = gui->getFont()->getWidth(text);
+
     switch (alignment)
     {
         case gcn::Graphics::LEFT:
@@ -57,12 +86,6 @@ Text::Text(const std::string &text, int x, int y,
     mX = x - mXOffset;
     mY = y;
     textManager->addText(this);
-    mFont = font;
-}
-
-void Text::adviseXY(int x, int y)
-{
-    textManager->moveText(this, x - mXOffset, y);
 }
 
 Text::~Text()
@@ -72,20 +95,83 @@ Text::~Text()
     {
         delete textManager;
         textManager = 0;
+        delete mBubble.grid[0];
+        delete mBubble.grid[1];
+        delete mBubble.grid[2];
+        delete mBubble.grid[3];
+        delete mBubble.grid[4];
+        delete mBubble.grid[5];
+        delete mBubble.grid[6];
+        delete mBubble.grid[7];
+        delete mBubble.grid[8];
+        delete mBubbleArrow;
     }
 }
 
+void Text::adviseXY(int x, int y)
+{
+    textManager->moveText(this, x - mXOffset, y);
+}
+
 void Text::draw(Graphics *graphics, int xOff, int yOff)
 {
-    graphics->setFont(mFont);
+    graphics->setFont(gui->getFont());
+
+    if (mIsSpeech) {
+        static_cast<Graphics*>(graphics)->drawImageRect(
+                mX - xOff - 5, mY - yOff - 5, mWidth + 10, mHeight + 10,
+                mBubble);
+        /*
+        if (mWidth >= 15) {
+            static_cast<Graphics*>(graphics)->drawImage(
+                    mBubbleArrow, mX - xOff - 7 + mWidth / 2,
+                    mY - yOff + mHeight + 4);
+        }
+        */
+    }
+
+    // Text shadow
+    graphics->setColor(gcn::Color(0, 0, 0));
+    graphics->drawText(mText, mX - xOff + 1, mY - yOff + 1,
+            gcn::Graphics::LEFT);
+
+    if (!mIsSpeech) {
+        graphics->setColor(gcn::Color(0, 0, 0, 64));
+        /*
+        // TODO: Reanable when we can draw it nicely in software mode
+        graphics->drawText(mText, mX - xOff + 2, mY - yOff + 2,
+                gcn::Graphics::LEFT);
+        graphics->drawText(mText, mX - xOff + 1, mY - yOff + 2,
+                gcn::Graphics::LEFT);
+        graphics->drawText(mText, mX - xOff + 2, mY - yOff + 1,
+                gcn::Graphics::LEFT);
+        */
+
+        // Text outline
+        graphics->setColor(gcn::Color(0, 0, 0));
+        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(mColour);
-    graphics->drawText(mText, mX - xOff, mY - yOff, gcn::Graphics::LEFT);
+    graphics->drawText(mText, mX - xOff, mY - yOff,
+            gcn::Graphics::LEFT);
 }
 
 FlashText::FlashText(const std::string &text, int x, int y,
-                     gcn::Graphics::Alignment alignment, gcn::Font *font,
+                     gcn::Graphics::Alignment alignment,
                      gcn::Color colour) :
-    Text(text, x, y, alignment, font, colour), mTime(0)
+    Text(text, x, y, alignment, colour),
+    mTime(0)
 {
 }