Skip to content
Permalink
Browse files

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

broken since e8a8185
  • Loading branch information
sfan5 committed Apr 26, 2020
1 parent e1fc72c commit eca6ee911a99f863abf79ab956d4c757e9e4bae3
Showing with 10 additions and 1 deletion.
  1. +10 −1 src/map_settings_manager.cpp
@@ -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);

0 comments on commit eca6ee9

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