Fix mapgen settings in minetest.conf being ignored (#9737)

broken since e8a8185d24897ccf964327017effae81aa1c9d40
This commit is contained in:
sfan5 2020-04-26 19:32:29 +02:00 committed by GitHub
parent e1fc72c6f3
commit eca6ee911a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -32,7 +32,6 @@ MapSettingsManager::MapSettingsManager(Settings *user_settings,
m_user_settings(user_settings)
{
assert(m_user_settings != NULL);
Mapgen::setDefaultSettings(m_map_settings);
}
@ -180,6 +179,16 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
params->mgtype = mgtype;
// Load the mapgen param defaults
/* FIXME: Why is it done like this? MapgenParams should just
* set the defaults in its constructor instead. */
{
Settings default_settings;
Mapgen::setDefaultSettings(&default_settings);
params->MapgenParams::readParams(&default_settings);
params->readParams(&default_settings);
}
// Load the rest of the mapgen params from our active settings
params->MapgenParams::readParams(m_user_settings);
params->MapgenParams::readParams(m_map_settings);