Fix a crash (assert) when client set serial version < 24 in INIT

[minetest.git] / src / fontengine.cpp

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index e6564854db2dc51693ccc3df8b54fecd872ff5e0..3b82a3c470ff82cec67702f4940eb40f9ff95b54 100644 (file)
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 FontEngine* g_fontengine = NULL;
 
 /** callback to be used on change of font size setting */
-static void font_setting_changed(const std::string) {
+static void font_setting_changed(const std::string, void *userdata) {
        g_fontengine->readSettings();
 }
 
@@ -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;
        }
 
@@ -92,22 +91,22 @@ FontEngine::FontEngine(Settings* main_settings, gui::IGUIEnvironment* env) :
        updateSkin();
 
        if (m_currentMode == FM_Standard) {
-               m_settings->registerChangedCallback("font_size", font_setting_changed);
-               m_settings->registerChangedCallback("font_path", font_setting_changed);
-               m_settings->registerChangedCallback("font_shadow", font_setting_changed);
-               m_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed);
+               m_settings->registerChangedCallback("font_size", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("font_path", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("font_shadow", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed, NULL);
        }
        else if (m_currentMode == FM_Fallback) {
-               m_settings->registerChangedCallback("fallback_font_size", font_setting_changed);
-               m_settings->registerChangedCallback("fallback_font_path", font_setting_changed);
-               m_settings->registerChangedCallback("fallback_font_shadow", font_setting_changed);
-               m_settings->registerChangedCallback("fallback_font_shadow_alpha", font_setting_changed);
+               m_settings->registerChangedCallback("fallback_font_size", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("fallback_font_path", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("fallback_font_shadow", font_setting_changed, NULL);
+               m_settings->registerChangedCallback("fallback_font_shadow_alpha", font_setting_changed, NULL);
        }
 
-       m_settings->registerChangedCallback("mono_font_path", font_setting_changed);
-       m_settings->registerChangedCallback("mono_font_size", font_setting_changed);
-       m_settings->registerChangedCallback("screen_dpi", font_setting_changed);
-       m_settings->registerChangedCallback("gui_scaling", font_setting_changed);
+       m_settings->registerChangedCallback("mono_font_path", font_setting_changed, NULL);
+       m_settings->registerChangedCallback("mono_font_size", font_setting_changed, NULL);
+       m_settings->registerChangedCallback("screen_dpi", font_setting_changed, NULL);
+       m_settings->registerChangedCallback("gui_scaling", font_setting_changed, NULL);
 }
 
 /******************************************************************************/
@@ -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);
        }