diff options
| author | sfan5 <sfan5@live.de> | 2022-01-08 14:53:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-08 14:53:25 +0100 |
| commit | 76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d (patch) | |
| tree | 248b907d2abeda0166d992bfb7b74b61cfe96d8a /src/irrlicht_changes/static_text.cpp | |
| parent | bf22569019749e421e8ffe0a73cff988a9a9c846 (diff) | |
| download | minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.tar.xz | |
Fully remove bitmap font support (#11863)
Freetype is now a build requirement.
Diffstat (limited to 'src/irrlicht_changes/static_text.cpp')
| -rw-r--r-- | src/irrlicht_changes/static_text.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp index f548c3f71..baf0ea626 100644 --- a/src/irrlicht_changes/static_text.cpp +++ b/src/irrlicht_changes/static_text.cpp @@ -12,17 +12,12 @@ #include <rect.h> #include <SColor.h> -#if USE_FREETYPE - #include "CGUITTFont.h" -#endif - +#include "CGUITTFont.h" #include "util/string.h" namespace irr { -#if USE_FREETYPE - namespace gui { //! constructor @@ -108,14 +103,12 @@ void StaticText::draw() font->getDimension(str.c_str()).Width; } -#if USE_FREETYPE if (font->getType() == irr::gui::EGFT_CUSTOM) { - irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(font); + CGUITTFont *tmp = static_cast<CGUITTFont*>(font); tmp->draw(str, r, HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER, (RestrainTextInside ? &AbsoluteClippingRect : NULL)); } else -#endif { // Draw non-colored text font->draw(str.c_str(), @@ -590,8 +583,6 @@ s32 StaticText::getTextWidth() const } // end namespace gui -#endif // USE_FREETYPE - } // end namespace irr |