diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/text.cpp | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/text.cpp')
| -rw-r--r-- | src/text.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/text.cpp b/src/text.cpp index b8e56338..e4f1d409 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -22,8 +22,6 @@ #include "text.h" -#include <cstring> - #include <guichan/font.hpp> #include "configuration.h" @@ -114,7 +112,7 @@ void Text::adviseXY(int x, int y) textManager->moveText(this, x - mXOffset, y); } -void Text::draw(Graphics *graphics, int xOff, int yOff) +void Text::draw(gcn::Graphics *graphics, int xOff, int yOff) { graphics->setFont(boldFont); @@ -176,7 +174,7 @@ FlashText::FlashText(const std::string &text, int x, int y, { } -void FlashText::draw(Graphics *graphics, int xOff, int yOff) +void FlashText::draw(gcn::Graphics *graphics, int xOff, int yOff) { if (mTime) { |