diff --git a/src/clouds.cpp b/src/clouds.cpp index e213d118fcce6a112f4388534227c88f485bcb6b..29210e2b4cda1ded6be22379ec81d71baa31c83c 100644 --- a/src/clouds.cpp +++ b/src/clouds.cpp @@ -30,7 +30,7 @@ class Clouds; Clouds *g_menuclouds = NULL; irr::scene::ISceneManager *g_menucloudsmgr = NULL; -static void cloud_3d_setting_changed(const std::string settingname, void *data) +static void cloud_3d_setting_changed(const std::string &settingname, void *data) { ((Clouds *)data)->readSettings(); } diff --git a/src/fontengine.cpp b/src/fontengine.cpp index 14b65f593ee34f74e194513c7cea695d5ef2653f..f881701e0f2306a2d6786772cd15ebbadf40d7fe 100644 --- a/src/fontengine.cpp +++ b/src/fontengine.cpp @@ -35,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(); } diff --git a/src/game.cpp b/src/game.cpp index ef3cb9044aaae5b28c916dfa0b1f3f665bdcaa4d..41bfa5e60b8817b267bdfee14e652432137d33b4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -806,7 +806,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter m_fogEnabled = g_settings->getBool("enable_fog"); } - static void SettingsCallback(const std::string name, void *userdata) + static void SettingsCallback(const std::string &name, void *userdata) { reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name); } diff --git a/src/settings.h b/src/settings.h index d43ad6a205e28c75a23f7e11449b679db32385d5..d41f134cd26c2246061b3e7534c9924290097e53 100644 --- a/src/settings.h +++ b/src/settings.h @@ -36,7 +36,7 @@ extern Settings *g_settings; extern std::string g_settings_path; /** function type to register a changed callback */ -typedef void (*setting_changed_callback)(const std::string, void*); +typedef void (*setting_changed_callback)(const std::string &name, void *data); enum ValueType { VALUETYPE_STRING,