More code cleanup (UNORDERED + RemotePlayer/LocalPlayer)

[minetest.git] / src / fontengine.cpp

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index c1e36d6c8c9df6d717dbfe541f850e4342d6ba2a..55ff001e728ba94ecfe2257ae20fd7201fbb94d6 100644 (file)
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 #include "fontengine.h"
 #include "log.h"
-#include "main.h"
 #include "config.h"
 #include "porting.h"
 #include "constants.h"
@@ -33,11 +32,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAX_FONT_SIZE_OFFSET 10
 
 /** reference to access font engine, has to be initialized by main */
-FontEngine* glb_fontengine = NULL;
+FontEngine* g_fontengine = NULL;
 
 /** callback to be used on change of font size setting */
-static void font_setting_changed(const std::string) {
-       glb_fontengine->readSettings();
+static void font_setting_changed(const std::string &name, void *userdata)
+{
+       g_fontengine->readSettings();
 }
 
 /******************************************************************************/
@@ -45,20 +45,19 @@ 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;
        }
 
-       assert(m_settings != NULL);
-       assert(m_env != NULL);
-       assert(m_env->getSkin() != NULL);
+       assert(m_settings != NULL); // pre-condition
+       assert(m_env != NULL); // pre-condition
+       assert(m_env->getSkin() != NULL); // pre-condition
 
        m_currentMode = FM_Simple;
 
@@ -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);
 }
 
 /******************************************************************************/
@@ -123,7 +122,7 @@ void FontEngine::cleanCache()
 
                for (std::map<unsigned int, irr::gui::IGUIFont*>::iterator iter
                                = m_font_cache[i].begin();
-                               iter != m_font_cache[i].end(); iter++) {
+                               iter != m_font_cache[i].end(); ++iter) {
                        iter->second->drop();
                        iter->second = NULL;
                }
@@ -173,7 +172,7 @@ unsigned int FontEngine::getTextHeight(unsigned int font_size, FontMode mode)
        if (font == NULL) {
                font = m_env->getSkin()->getFont();
        }
-       assert(font != NULL);
+       FATAL_ERROR_IF(font == NULL, "Could not get skin font");
 
        return font->getDimension(L"Some unimportant example String").Height;
 }
@@ -188,7 +187,7 @@ unsigned int FontEngine::getTextWidth(const std::wstring& text,
        if (font == NULL) {
                font = m_env->getSkin()->getFont();
        }
-       assert(font != NULL);
+       FATAL_ERROR_IF(font == NULL, "Could not get font");
 
        return font->getDimension(text.c_str()).Width;
 }
@@ -203,7 +202,7 @@ unsigned int FontEngine::getLineHeight(unsigned int font_size, FontMode mode)
        if (font == NULL) {
                font = m_env->getSkin()->getFont();
        }
-       assert(font != NULL);
+       FATAL_ERROR_IF(font == NULL, "Could not get font");
 
        return font->getDimension(L"Some unimportant example String").Height
                        + font->getKerningHeight();
@@ -256,7 +255,7 @@ void FontEngine::updateSkin()
 
        // If we did fail to create a font our own make irrlicht find a default one
        font = m_env->getSkin()->getFont();
-       assert(font);
+       FATAL_ERROR_IF(font == NULL, "Could not create/get font");
 
        u32 text_height = font->getDimension(L"Hello, world!").Height;
        infostream << "text_height=" << text_height << std::endl;
@@ -338,18 +337,11 @@ 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);
 
                if (font != NULL) {
-                       font->grab();
                        m_font_cache[mode][basesize] = font;
                }
                else {
@@ -363,7 +355,7 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
 /** initialize a font without freetype */
 void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
 {
-       assert((mode == FM_Simple) || (mode == FM_SimpleMono));
+       assert(mode == FM_Simple || mode == FM_SimpleMono); // pre-condition
 
        std::string font_path = "";
        if (mode == FM_Simple) {
@@ -380,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);
        }