summaryrefslogtreecommitdiff
path: root/src/text.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-21 01:26:07 +0300
commit98dabed4de60bc86522632379f2499aecbae2b70 (patch)
tree48924b90447eb513f330c1e82d9afbab3719525e /src/text.h
parentec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff)
downloadmv-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz
mv-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2
mv-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz
mv-98dabed4de60bc86522632379f2499aecbae2b70.zip
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/text.h')
-rw-r--r--src/text.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/text.h b/src/text.h
index e28e70ac7..25fbe66f0 100644
--- a/src/text.h
+++ b/src/text.h
@@ -26,6 +26,7 @@
#include "graphics.h"
#include "guichanfwd.h"
+#include "localconsts.h"
#include <guichan/color.hpp>
@@ -42,7 +43,7 @@ class Text
Text(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
const gcn::Color *color, bool isSpeech = false,
- gcn::Font *font = 0);
+ gcn::Font *font = nullptr);
/**
* Destructor. The text is removed from the screen.
@@ -90,7 +91,7 @@ class FlashText : public Text
FlashText(const std::string &text, int x, int y,
gcn::Graphics::Alignment alignment,
const gcn::Color* color,
- gcn::Font *font = 0);
+ gcn::Font *font = nullptr);
/**
* Remove the text from the screen