diff options
| author | SmallJoker <mk939@ymail.com> | 2020-11-22 17:49:30 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2021-01-29 17:32:35 +0100 |
| commit | 37a05ec8d6cbf9ff4432225cffe78c16fdd0647d (patch) | |
| tree | 727e4272f1f16fe1a6a51484d1bba728c8632615 /src/main.cpp | |
| parent | 5e9dd1667b244df4e7767be404d4a12966d6a90a (diff) | |
| download | minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.tar.gz minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.tar.bz2 minetest-37a05ec8d6cbf9ff4432225cffe78c16fdd0647d.zip | |
Settings: Proper priority hierarchy
Remove old defaults system
Introduce priority-based fallback list
Use new functions for map_meta special functions
Change groups to use end tags
Unittest changes:
* Adapt unittest to the new code
* Compare Settings objects
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index f7238176b..57768dbb2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -487,12 +487,15 @@ static bool create_userdata_path() static bool init_common(const Settings &cmd_args, int argc, char *argv[]) { startup_message(); - set_default_settings(g_settings); + set_default_settings(); // Initialize sockets sockets_init(); atexit(sockets_cleanup); + // Initialize g_settings + Settings::createLayer(SL_GLOBAL); + if (!read_config_file(cmd_args)) return false; @@ -524,6 +527,7 @@ static bool read_config_file(const Settings &cmd_args) // Path of configuration file in use sanity_check(g_settings_path == ""); // Sanity check + if (cmd_args.exists("config")) { bool r = g_settings->readConfigFile(cmd_args.get("config").c_str()); if (!r) { |