From: sfan5 <sfan5@live.de>
Date: Sun, 26 Apr 2020 17:32:29 +0000 (+0200)
Subject: Fix mapgen settings in minetest.conf being ignored (#9737)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eca6ee911a99f863abf79ab956d4c757e9e4bae3;p=oweals%2Fminetest.git

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

broken since e8a8185d24897ccf964327017effae81aa1c9d40
---

diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 7ef4bf12e..4f070e910 100644
--- a/src/map_settings_manager.cpp
+++ b/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);