diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2020-02-17 19:26:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 19:26:32 +0100 |
| commit | e8a8185d24897ccf964327017effae81aa1c9d40 (patch) | |
| tree | 0aec3d4406a7bcf1bea0fb9b32e3ac9dd8be5f78 /src/settings.h | |
| parent | 6958071f497c8f059429343339ad3818ed3cfed1 (diff) | |
| download | minetest-e8a8185d24897ccf964327017effae81aa1c9d40.tar.gz minetest-e8a8185d24897ccf964327017effae81aa1c9d40.tar.bz2 minetest-e8a8185d24897ccf964327017effae81aa1c9d40.zip | |
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
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 2 |
1 files changed, 2 insertions, 0 deletions
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, |