From 055345145f35286b3f45ed05d5a80d118a1ab8f4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 26 May 2015 14:38:25 +0300 Subject: Use local TextChunk in text class. --- src/text.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/text.h') diff --git a/src/text.h b/src/text.h index fbb36050b..845b96353 100644 --- a/src/text.h +++ b/src/text.h @@ -24,6 +24,8 @@ #ifndef TEXT_H #define TEXT_H +#include "gui/fonts/textchunk.h" + #include "render/graphics.h" #include "localconsts.h" @@ -70,7 +72,8 @@ class Text notfinal const int xOff, const int yOff); private: - Font *mFont; /**< The font of the text */ + Font *mFont; /**< The font of the text */ + TextChunk mTextChunk; int mX; /**< Actual x-value of left of text written. */ int mY; /**< Actual y-value of top of text written. */ int mWidth; /**< The width of the text. */ @@ -78,9 +81,10 @@ class Text notfinal int mXOffset; /**< The offset of mX from the desired x. */ static int mInstances; /**< Instances of text. */ std::string mText; /**< The text to display. */ - const Color *mColor; /**< The color of the text. */ - const Color mOutlineColor; + const Color *mColor; /**< The color of the text. */ + Color mOutlineColor; bool mIsSpeech; /**< Is this text a speech bubble? */ + bool mTextChanged; protected: static ImageRect mBubble; /**< Speech bubble graphic */ -- cgit v1.2.3-60-g2f50