LuaVoxelManip: Add option to allocate blank data

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

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index c1e36d6c8c9df6d717dbfe541f850e4342d6ba2a..b9d35ba4218963725d166ed1c36d6cd238d7f113 100644 (file)
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -33,11 +33,11 @@ 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();
+       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;
        }
 
@@ -349,7 +348,6 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
                                font_shadow_alpha);
 
                if (font != NULL) {
-                       font->grab();
                        m_font_cache[mode][basesize] = font;
                }
                else {