summaryrefslogtreecommitdiff
path: root/src/text.h
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.h
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/text.h')
-rw-r--r--src/text.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/text.h b/src/text.h
index b21ca51a7..cade9db18 100644
--- a/src/text.h
+++ b/src/text.h
@@ -30,10 +30,7 @@
#include "localconsts.h"
-namespace gcn
-{
- class Font;
-}
+class Font;
class Text
{
@@ -46,7 +43,7 @@ class Text
Text(const std::string &text, const int x, const int y,
const Graphics::Alignment alignment,
const gcn::Color *const color, const bool isSpeech = false,
- gcn::Font *const font = nullptr);
+ Font *const font = nullptr);
A_DELETE_COPY(Text)
@@ -75,7 +72,7 @@ class Text
const int xOff, const int yOff);
private:
- gcn::Font *mFont; /**< The font of the text */
+ Font *mFont; /**< The font of the text */
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. */
@@ -97,7 +94,7 @@ class FlashText final : public Text
FlashText(const std::string &text, const int x, const int y,
const Graphics::Alignment alignment,
const gcn::Color *const color,
- gcn::Font *const font = nullptr);
+ Font *const font = nullptr);
A_DELETE_COPY(FlashText)