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/gui/guiChatConsole.cpp | |
| parent | bf22569019749e421e8ffe0a73cff988a9a9c846 (diff) | |
| download | minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.tar.gz minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.tar.bz2 minetest-76dbd0d2d04712dcad4f7c6afecb97fa8d662d6d.zip | |
Fully remove bitmap font support (#11863)
Freetype is now a build requirement.
Diffstat (limited to 'src/gui/guiChatConsole.cpp')
| -rw-r--r-- | src/gui/guiChatConsole.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/gui/guiChatConsole.cpp b/src/gui/guiChatConsole.cpp index 0610c85cc..01e10ea2e 100644 --- a/src/gui/guiChatConsole.cpp +++ b/src/gui/guiChatConsole.cpp @@ -30,12 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/fontengine.h" #include "log.h" #include "gettext.h" +#include "irrlicht_changes/CGUITTFont.h" #include <string> -#if USE_FREETYPE - #include "irrlicht_changes/CGUITTFont.h" -#endif - inline u32 clamp_u8(s32 value) { return (u32) MYMIN(MYMAX(value, 0), 255); @@ -328,19 +325,16 @@ void GUIChatConsole::drawText() core::rect<s32> destrect( x, y, x + m_fontsize.X * fragment.text.size(), y + m_fontsize.Y); -#if USE_FREETYPE if (m_font->getType() == irr::gui::EGFT_CUSTOM) { - // Draw colored text if FreeType is enabled - irr::gui::CGUITTFont *tmp = dynamic_cast<irr::gui::CGUITTFont *>(m_font); + // Draw colored text if possible + gui::CGUITTFont *tmp = static_cast<gui::CGUITTFont*>(m_font); tmp->draw( fragment.text, destrect, false, false, &AbsoluteClippingRect); - } else -#endif - { + } else { // Otherwise use standard text m_font->draw( fragment.text.c_str(), |