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/defaultsettings.cpp | |
| 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/defaultsettings.cpp')
| -rw-r--r-- | src/defaultsettings.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
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)); - } -} |