Fixes for android

[minetest.git] / src / fontengine.cpp

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index f73f47ff7f4135225c2e599a1120c16fb8659967..79d53c9898cd7306d350be1f60d0019c4dd4c724 100644 (file)
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -45,14 +45,13 @@ FontEngine::FontEngine(Settings* main_settings, gui::IGUIEnvironment* env) :
        m_settings(main_settings),
        m_env(env),
        m_font_cache(),
-       m_default_size(),
        m_currentMode(FM_Standard),
        m_lastMode(),
        m_lastSize(0),
        m_lastFont(NULL)
 {
 
-       for ( unsigned int i = 0; i < FM_MaxMode; i++) {
+       for (unsigned int i = 0; i < FM_MaxMode; i++) {
                m_default_size[i] = (FontMode) FONT_SIZE_UNSPECIFIED;
        }
 
@@ -338,12 +337,6 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
 
                std::string font_path = g_settings->get(font_config_prefix + "font_path");
 
-               if (font_path.substr(font_path.length() -4) != ".ttf") {
-                       errorstream << "FontEngine: \"" << font_path
-                                       << "\" doesn't seem to be a ttf File." << std::endl;
-                       return;
-               }
-
                irr::gui::IGUIFont* font = gui::CGUITTFont::createTTFont(m_env,
                                font_path.c_str(), size, true, true, font_shadow,
                                font_shadow_alpha);
@@ -379,7 +372,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
                return;
        }
 
-       if ((ending == ".xml") || ( ending == ".png")) {
+       if ((ending == ".xml") || (ending == ".png")) {
                basename = font_path.substr(0,font_path.length()-4);
        }
 
@@ -456,6 +449,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
        }
 
        if (font != NULL) {
+               font->grab();
                m_font_cache[mode][basesize] = font;
        }
 }