From a1b8d20f184ccc59d1c102fbc9b090d66c34e62a Mon Sep 17 00:00:00 2001 From: wozrer Date: Thu, 2 Jan 2025 12:54:44 +0300 Subject: [PATCH] Rename getMapSettingNoiseParams to getNoiseParams --- src/map_settings_manager.cpp | 3 +-- src/map_settings_manager.h | 2 +- src/script/lua_api/l_mapgen.cpp | 2 +- src/unittest/test_map_settings_manager.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp index b73a4769f..36339fc5e 100644 --- a/src/map_settings_manager.cpp +++ b/src/map_settings_manager.cpp @@ -41,10 +41,9 @@ bool MapSettingsManager::getMapSetting( } -bool MapSettingsManager::getMapSettingNoiseParams( +bool MapSettingsManager::getNoiseParams( const std::string &name, NoiseParams *value_out) const { - // TODO: Rename to "getNoiseParams" return m_map_settings->getNoiseParams(name, *value_out); } diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h index 3ef08de67..f1b2a71db 100644 --- a/src/map_settings_manager.h +++ b/src/map_settings_manager.h @@ -37,7 +37,7 @@ public: bool getMapSetting(const std::string &name, std::string *value_out) const; - bool getMapSettingNoiseParams(const std::string &name, + bool getNoiseParams(const std::string &name, NoiseParams *value_out) const; // Note: Map config becomes read-only after makeMapgenParams() gets called diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index a7101ee92..aa017a0ea 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -892,7 +892,7 @@ int ModApiMapgen::l_get_mapgen_setting_noiseparams(lua_State *L) getEmergeManager(L)->map_settings_mgr; const char *name = luaL_checkstring(L, 1); - if (!settingsmgr->getMapSettingNoiseParams(name, &np)) + if (!settingsmgr->getNoiseParams(name, &np)) return 0; push_noiseparams(L, &np); diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp index 8fb074e17..2b844b5e4 100644 --- a/src/unittest/test_map_settings_manager.cpp +++ b/src/unittest/test_map_settings_manager.cpp @@ -129,7 +129,7 @@ void TestMapSettingsManager::testMapSettingsManager() { NoiseParams dummy; - mgr.getMapSettingNoiseParams("mgv5_np_factor", &dummy); + mgr.getNoiseParams("mgv5_np_factor", &dummy); check_noise_params(&dummy, &script_np_factor); }