Cpp11 initializers: last src root changeset (#6022)

[oweals/minetest.git] / src / map_settings_manager.cpp

diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 53d17125c31be5a0dd7a0bd84a7161e7b61f10c0..c1dcf52156c3ff765a4c7674349988391ac38eeb 100644 (file)
--- a/src/map_settings_manager.cpp
+++ b/src/map_settings_manager.cpp
@@ -25,14 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "map_settings_manager.h"
 
-MapSettingsManager::MapSettingsManager(
-       Settings *user_settings, const std::string &map_meta_path)
+MapSettingsManager::MapSettingsManager(Settings *user_settings,
+               const std::string &map_meta_path):
+       m_map_meta_path(map_meta_path),
+       m_map_settings(new Settings()),
+       m_user_settings(user_settings)
 {
-       m_map_meta_path = map_meta_path;
-       m_user_settings = user_settings;
-       m_map_settings  = new Settings;
-       mapgen_params   = NULL;
-
        assert(m_user_settings != NULL);
 }