From e8a8185d24897ccf964327017effae81aa1c9d40 Mon Sep 17 00:00:00 2001 From: SmallJoker 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/content/subgames.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/content') diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp index 39cdc056f..bf947cf85 100644 --- a/src/content/subgames.cpp +++ b/src/content/subgames.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "settings.h" #include "log.h" #include "util/strfnd.h" -#include "defaultsettings.h" // for override_default_settings +#include "defaultsettings.h" // for set_default_settings #include "mapgen/mapgen.h" // for MapgenParams #include "util/string.h" @@ -298,7 +298,7 @@ bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamesp set_default_settings(g_settings); Settings game_defaults; getGameMinetestConfig(gamespec.path, game_defaults); - override_default_settings(g_settings, &game_defaults); + g_settings->overrideDefaults(&game_defaults); infostream << "Initializing world at " << path << std::endl; -- cgit v1.2.3