diff options
| author | gregorycu <gregory.currie@gmail.com> | 2015-01-24 20:40:27 +1100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-25 15:23:37 +1000 |
| commit | ed7c9c4cb83da887a2a7f1b7f5fc1656057977e7 (patch) | |
| tree | 62455be3c1be6a0d4040c770a37d8dcc82ad867b /src/fontengine.cpp | |
| parent | 2c4a5e18619a69159bcace8c03b4ea5642f46836 (diff) | |
| download | minetest-ed7c9c4cb83da887a2a7f1b7f5fc1656057977e7.tar.gz minetest-ed7c9c4cb83da887a2a7f1b7f5fc1656057977e7.tar.bz2 minetest-ed7c9c4cb83da887a2a7f1b7f5fc1656057977e7.zip | |
Settings fixes Make the GameGlobalShaderConstantSetter use the settings callback (8% perf improvement in game loop) Ensure variable is set Ensure settings callback is threadsafe
Diffstat (limited to 'src/fontengine.cpp')
| -rw-r--r-- | src/fontengine.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/fontengine.cpp b/src/fontengine.cpp index 79d53c989..3b82a3c47 100644 --- 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(); } @@ -91,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); } /******************************************************************************/ |