aboutsummaryrefslogtreecommitdiff
path: root/src/map_settings_manager.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-06-23 15:22:31 +0200
committerGitHub <noreply@github.com>2021-06-23 15:22:31 +0200
commitc60a146e2291f7a55a3e5fd0447bd393b063ab1c (patch)
tree7a0810ef78f43866eb899145d6afdb36d99f2720 /src/map_settings_manager.h
parentcec0dfcbbda1e11e5ff2f45e58ea393d0437d7c6 (diff)
downloadminetest-c60a146e2291f7a55a3e5fd0447bd393b063ab1c.tar.xz
Rework Settings to support arbitrary hierarchies (#11352)
Diffstat (limited to 'src/map_settings_manager.h')
-rw-r--r--src/map_settings_manager.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h
index 9258d3032..fa271268d 100644
--- a/src/map_settings_manager.h
+++ b/src/map_settings_manager.h
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
#include <string>
+#include "settings.h"
-class Settings;
struct NoiseParams;
struct MapgenParams;
@@ -70,6 +70,8 @@ public:
private:
std::string m_map_meta_path;
- // TODO: Rename to "m_settings"
+
+ SettingsHierarchy m_hierarchy;
+ Settings *m_defaults;
Settings *m_map_settings;
};