oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Use unique_ptr for trivial ownership (#16300)

Browse source
This commit is contained in:
Lucas OH 2025-07-03 17:32:46 +02:00 • committed by GitHub
parent 08bc036311
commit 5b37614d23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 44 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/map_settings_manager.cpp
View file

@ -21,15 +21,13 @@ MapSettingsManager::MapSettingsManager(const std::string &map_meta_path):
* 1: defaults set by scripts (override_meta = false)
* 2: settings present in map_meta.txt or overridden by scripts
*/
m_defaults = new Settings("", &m_hierarchy, 1);
m_map_settings = new Settings("[end_of_params]", &m_hierarchy, 2);
m_defaults = std::make_unique<Settings>("", &m_hierarchy, 1);
m_map_settings = std::make_unique<Settings>("[end_of_params]", &m_hierarchy, 2);
}
MapSettingsManager::~MapSettingsManager()
{
delete m_defaults;
delete m_map_settings;
delete mapgen_params;
}
@ -109,8 +107,8 @@ bool MapSettingsManager::saveMapMeta()
return false;
}
mapgen_params->MapgenParams::writeParams(m_map_settings);
mapgen_params->writeParams(m_map_settings);
mapgen_params->MapgenParams::writeParams(m_map_settings.get());
mapgen_params->writeParams(m_map_settings.get());
if (!m_map_settings->updateConfigFile(m_map_meta_path.c_str())) {
errorstream << "saveMapMeta: could not write "
@ -150,8 +148,8 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
params->mgtype = mgtype;
// Load the rest of the mapgen params from our active settings
params->MapgenParams::readParams(m_map_settings);
params->readParams(m_map_settings);
params->MapgenParams::readParams(m_map_settings.get());
params->readParams(m_map_settings.get());
// Hold onto our params
mapgen_params = params;