summaryrefslogtreecommitdiff
path: root/src/text.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/text.cpp
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
ManaVerse-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/text.cpp')
-rw-r--r--src/text.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/text.cpp b/src/text.cpp
index 943d31f67..dfc127598 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,14 +26,12 @@
#include "configuration.h"
#include "textmanager.h"
+#include "gui/font.h"
#include "gui/gui.h"
-#include "gui/sdlfont.h"
#include "gui/theme.h"
#include "resources/image.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
int Text::mInstances = 0;
@@ -42,7 +40,7 @@ ImageRect Text::mBubble;
Text::Text(const std::string &text, const int x, const int y,
const Graphics::Alignment alignment,
const gcn::Color *const color, const bool isSpeech,
- gcn::Font *const font) :
+ Font *const font) :
mFont(font ? font : (gui ? gui->getFont() : nullptr)),
mX(x),
mY(y),
@@ -154,7 +152,7 @@ void Text::draw(Graphics *const graphics, const int xOff, const int yOff)
FlashText::FlashText(const std::string &text, const int x, const int y,
const Graphics::Alignment alignment,
- const gcn::Color *const color, gcn::Font *const font) :
+ const gcn::Color *const color, Font *const font) :
Text(text, x, y, alignment, color, false, font),
mTime(0)
{