Skip to content
Permalink
Browse files

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

  • Loading branch information
SmallJoker committed Aug 28, 2020
1 parent 454009a commit d28f1b01707dfa15e770096a26495452513bc56f
Showing with 4 additions and 12 deletions.
  1. +4 −12 src/map_settings_manager.cpp
@@ -32,6 +32,10 @@ MapSettingsManager::MapSettingsManager(Settings *user_settings,
m_user_settings(user_settings)
{
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;

// 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);
params->readParams(m_user_settings);
params->readParams(m_map_settings);

// Hold onto our params

0 comments on commit d28f1b0

Please sign in to comment.
You can’t perform that action at this time.