Modernize client code (#6250)

[oweals/minetest.git] / src / fontengine.h

diff --git a/src/fontengine.h b/src/fontengine.h
index 6a53397707a7cace65c7cd022201c68e8698070b..0c97ac77b3c9b78108f5eeb0fe52dc0e11c43581 100644 (file)
--- a/src/fontengine.h
+++ b/src/fontengine.h
@@ -59,7 +59,7 @@ public:
                        unsigned int font_size=FONT_SIZE_UNSPECIFIED,
                        FontMode mode=FM_Unspecified)
        {
-               return getTextWidth(narrow_to_wide(text));
+               return getTextWidth(utf8_to_wide(text));
        }
 
        /** get text width if a text for a specific font */
@@ -86,7 +86,6 @@ private:
                m_settings(NULL),
                m_env(NULL),
                m_font_cache(),
-               m_default_size(),
                m_currentMode(FM_Standard),
                m_lastMode(),
                m_lastSize(0),
@@ -121,20 +120,20 @@ private:
        unsigned int m_default_size[FM_MaxMode];
 
        /** current font engine mode */
-       FontMode m_currentMode;
+       FontMode m_currentMode = FM_Standard;
 
        /** font mode of last request */
        FontMode m_lastMode;
 
        /** size of last request */
-       unsigned int m_lastSize;
+       unsigned int m_lastSize = 0;
 
        /** last font returned */
-       irr::gui::IGUIFont* m_lastFont;
+       irr::gui::IGUIFont* m_lastFont = nullptr;
 
 };
 
 /** interface to access main font engine*/
-extern FontEngine* glb_fontengine;
+extern FontEngine* g_fontengine;
 
 #endif