From e8a8185d24897ccf964327017effae81aa1c9d40 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Mon, 17 Feb 2020 19:26:32 +0100
Subject: Settings: Fix game minetest.conf flags overriding defaults (#9404)

The game minetest.conf flags directly overwrote the global minetest.conf default values, resulting in unwanted erased mapgen flags.

* Fix set_mapgen_setting
---
 src/defaultsettings.cpp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/defaultsettings.cpp')

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 754ce3547..b6e385a90 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -498,10 +498,3 @@ void set_default_settings(Settings *settings)
 #endif
 }
 
-void override_default_settings(Settings *settings, Settings *from)
-{
-	std::vector<std::string> names = from->getNames();
-	for (const auto &name : names) {
-		settings->setDefault(name, from->get(name));
-	}
-}
-- 
cgit v1.2.3