BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Mapgen: Fix on-by-default flags broken since eca6ee9 (#10318)

Browse Source
This commit is contained in:
SmallJoker 2020-08-29 00:14:38 +02:00 committed by GitHub
parent 454009a7f2
commit d28f1b0170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/map_settings_manager.cpp
View File

@ -32,6 +32,10 @@ MapSettingsManager::MapSettingsManager(Settings *user_settings,
m_user_settings(user_settings) m_user_settings(user_settings)
{ {
assert(m_user_settings != NULL); assert(m_user_settings != NULL);
Mapgen::setDefaultSettings(m_map_settings);
// This inherits the combined defaults provided by loadGameConfAndInitWorld.
m_map_settings->overrideDefaults(user_settings);
} }
@ -179,20 +183,8 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
params->mgtype = mgtype; 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 // Load the rest of the mapgen params from our active settings
params->MapgenParams::readParams(m_user_settings);
params->MapgenParams::readParams(m_map_settings); params->MapgenParams::readParams(m_map_settings);
params->readParams(m_user_settings);
params->readParams(m_map_settings); params->readParams(m_map_settings);
// Hold onto our params // Hold onto our params