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/content | |
| 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/content')
| -rw-r--r-- | src/content/subgames.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |