Revert "Replace MyEventReceiver KeyList with std::unordered_set" (#10622)

[dragonfireclient.git] / src / map_settings_manager.cpp

diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 7ef4bf12e30e160caf69bff7b42e64918d816db7..9c447b3d0262eb33c5f4547e7616746121f8adb2 100644 (file)
--- a/src/map_settings_manager.cpp
+++ b/src/map_settings_manager.cpp
@@ -32,7 +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);
 }
 
 
@@ -181,9 +184,7 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
        params->mgtype = mgtype;
 
        // 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