MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Settings: pass name to callbacks by reference 

Spare some copies.
master
est31 2015-07-09 08:23:08 +02:00
parent 4ece2b9e32
commit cb8978fb1d
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clouds.cpp
View File

@ -30,7 +30,7 @@ class Clouds;
Clouds *g_menuclouds = NULL; Clouds *g_menuclouds = NULL;
irr::scene::ISceneManager *g_menucloudsmgr = 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(); ((Clouds *)data)->readSettings();
} }

3
src/fontengine.cpp
View File

@ -35,7 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
FontEngine* g_fontengine = NULL; FontEngine* g_fontengine = NULL;
/** callback to be used on change of font size setting */ /** 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(); g_fontengine->readSettings();
} }

2
src/game.cpp
View File

@ -806,7 +806,7 @@ public:
m_fogEnabled = g_settings->getBool("enable_fog"); 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); reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name);
} }

2
src/settings.h
View File

@ -36,7 +36,7 @@ extern Settings *g_settings;
extern std::string g_settings_path; extern std::string g_settings_path;
/** function type to register a changed callback */ /** 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 { enum ValueType {
VALUETYPE_STRING, VALUETYPE_STRING,