luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Settings: Proper priority hierarchy

Browse Source 
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:
SmallJoker
2020-11-22 17:49:30 +01:00
committed by sfan5
parent 5e9dd1667b
commit 37a05ec8d6
21 changed files with 358 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/map_settings_manager.h
View File

@@ -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;
};