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/settings.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index b42e36d10..0c9a155db 100644 --- a/src/settings.h +++ b/src/settings.h @@ -222,6 +222,8 @@ public: **************/ void setDefault(const std::string &name, const FlagDesc *flagdesc, u32 flags); + // Takes the provided setting values and uses them as new defaults + void overrideDefaults(Settings *other); const FlagDesc *getFlagDescFallback(const std::string &name) const; void registerChangedCallback(const std::string &name, -- cgit v1.2.3