mirror of
https://github.com/luanti-org/luanti.git
synced 2025-07-02 16:38:41 +00:00
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
This commit is contained in:
parent
5e9dd1667b
commit
37a05ec8d6
21 changed files with 358 additions and 298 deletions
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue