FormSpec: Add StaticTextSpec and superimpose over item image buttons

[minetest.git] / src / fontengine.cpp

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index fa30b403813795a15ce3662d9117e835e63f046a..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"
@@ -36,7 +35,8 @@ 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, void *userdata) {
+static void font_setting_changed(const std::string &name, void *userdata)
+{
        g_fontengine->readSettings();
 }
 
@@ -122,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;
                }