diff options
| author | Andrei Karas <akaras@inbox.ru> | 2010-05-24 02:29:28 +0300 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-05-24 12:59:53 -0600 |
| commit | 98820e79e786f3d318a45e0f8e6100841530ff50 (patch) | |
| tree | 2ea5e02d7320881b523303bd789406ac5fbfc0f8 /src/text.cpp | |
| parent | 698620d703fea6d572c967bfa746d475d28f2d81 (diff) | |
| download | mana-98820e79e786f3d318a45e0f8e6100841530ff50.tar.gz mana-98820e79e786f3d318a45e0f8e6100841530ff50.tar.bz2 mana-98820e79e786f3d318a45e0f8e6100841530ff50.tar.xz mana-98820e79e786f3d318a45e0f8e6100841530ff50.zip | |
Show selected target with bold font.
Also fix possible memory corruption.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/text.cpp b/src/text.cpp index f6c71dba..9f970872 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -41,12 +41,17 @@ Image *Text::mBubbleArrow; Text::Text(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, - const gcn::Color* color, bool isSpeech) : + const gcn::Color* color, bool isSpeech, + gcn::Font *font) : mText(text), mColor(color), - mFont(gui->getFont()), mIsSpeech(isSpeech) { + if (!font) + mFont = gui->getFont(); + else + mFont = font; + if (textManager == 0) { textManager = new TextManager; @@ -145,8 +150,8 @@ void Text::draw(gcn::Graphics *graphics, int xOff, int yOff) FlashText::FlashText(const std::string &text, int x, int y, gcn::Graphics::Alignment alignment, - const gcn::Color *color) : - Text(text, x, y, alignment, color), + const gcn::Color *color, gcn::Font *font) : + Text(text, x, y, alignment, color, false, font), mTime(0) { } |