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/map_settings_manager.h | |
| 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/map_settings_manager.h')
| -rw-r--r-- | src/map_settings_manager.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h index 5baa38455..9258d3032 100644 --- a/src/map_settings_manager.h +++ b/src/map_settings_manager.h @@ -44,8 +44,7 @@ struct MapgenParams; */ class MapSettingsManager { public: - MapSettingsManager(Settings *user_settings, - const std::string &map_meta_path); + MapSettingsManager(const std::string &map_meta_path); ~MapSettingsManager(); // Finalized map generation parameters @@ -71,6 +70,6 @@ public: private: std::string m_map_meta_path; + // TODO: Rename to "m_settings" Settings *m_map_settings; - Settings *m_user_settings; }; |