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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/text.h b/src/text.h
index 6e121da7..a96096cc 100644
--- a/src/text.h
+++ b/src/text.h
@@ -40,7 +40,7 @@ class Text
          */
         Text(const std::string &text, int x, int y,
              gcn::Graphics::Alignment alignment,
-             gcn::Color color, bool isSpeech = false);
+             const gcn::Color *color, bool isSpeech = false);
 
         /**
          * Destructor. The text is removed from the screen.
@@ -65,7 +65,7 @@ class Text
         int mXOffset;          /**< The offset of mX from the desired x. */
         static int mInstances; /**< Instances of text. */
         std::string mText;     /**< The text to display. */
-        gcn::Color mColor;     /**< The color of the text. */
+        const gcn::Color *mColor;     /**< The color of the text. */
         bool mIsSpeech;        /**< Is this text a speech bubble? */
 
     protected:
@@ -78,7 +78,7 @@ class FlashText : public Text
     public:
         FlashText(const std::string &text, int x, int y,
                   gcn::Graphics::Alignment alignment,
-                  gcn::Color color);
+                  const gcn::Color* color);
 
         /**
          * Remove the text from the screen