diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/map_settings_manager.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/map_settings_manager.h')
| -rw-r--r-- | src/map_settings_manager.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h index 5baa38455..e7383cec5 100644 --- a/src/map_settings_manager.h +++ b/src/map_settings_manager.h @@ -42,10 +42,10 @@ struct MapgenParams; to whichever Map-related objects that may require it. - Save these active settings to the metadata file when requested */ -class MapSettingsManager { +class MapSettingsManager +{ public: - MapSettingsManager(Settings *user_settings, - const std::string &map_meta_path); + MapSettingsManager(Settings *user_settings, const std::string &map_meta_path); ~MapSettingsManager(); // Finalized map generation parameters @@ -53,17 +53,16 @@ public: bool getMapSetting(const std::string &name, std::string *value_out); - bool getMapSettingNoiseParams( - const std::string &name, NoiseParams *value_out); + bool getMapSettingNoiseParams(const std::string &name, NoiseParams *value_out); // Note: Map config becomes read-only after makeMapgenParams() gets called // (i.e. mapgen_params is non-NULL). Attempts to set map config after // params have been finalized will result in failure. - bool setMapSetting(const std::string &name, - const std::string &value, bool override_meta = false); + bool setMapSetting(const std::string &name, const std::string &value, + bool override_meta = false); - bool setMapSettingNoiseParams(const std::string &name, - const NoiseParams *value, bool override_meta = false); + bool setMapSettingNoiseParams(const std::string &name, const NoiseParams *value, + bool override_meta = false); bool loadMapMeta(); bool saveMapMeta(); |