aboutsummaryrefslogtreecommitdiff
path: root/src/map_settings_manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/map_settings_manager.h')
-rw-r--r--src/map_settings_manager.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h
index 9f766f1f0..fa271268d 100644
--- a/src/map_settings_manager.h
+++ b/src/map_settings_manager.h
@@ -17,12 +17,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MAP_SETTINGS_MANAGER_HEADER
-#define MAP_SETTINGS_MANAGER_HEADER
+#pragma once
#include <string>
+#include "settings.h"
-class Settings;
struct NoiseParams;
struct MapgenParams;
@@ -45,13 +44,12 @@ struct MapgenParams;
*/
class MapSettingsManager {
public:
- // Finalized map generation parameters
- MapgenParams *mapgen_params;
-
- MapSettingsManager(Settings *user_settings,
- const std::string &map_meta_path);
+ MapSettingsManager(const std::string &map_meta_path);
~MapSettingsManager();
+ // Finalized map generation parameters
+ MapgenParams *mapgen_params = nullptr;
+
bool getMapSetting(const std::string &name, std::string *value_out);
bool getMapSettingNoiseParams(
@@ -72,8 +70,8 @@ public:
private:
std::string m_map_meta_path;
+
+ SettingsHierarchy m_hierarchy;
+ Settings *m_defaults;
Settings *m_map_settings;
- Settings *m_user_settings;
};
-
-#endif