Merge branch 'master' into master

1 files changed, 21 insertions, 18 deletions

diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index c4edc1f06..0a5c971b9 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -1,4 +1,4 @@
-/*
+ /*
 Minetest
 Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
 
@@ -25,8 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/sha1.h"
 #include "map_settings_manager.h"
 
-class TestMapSettingsManager : public TestBase
-{
+class TestMapSettingsManager : public TestBase {
 public:
 	TestMapSettingsManager() { TestManager::registerTestModule(this); }
 	const char *getName() { return "TestMapSettingsManager"; }
@@ -52,6 +51,7 @@ void TestMapSettingsManager::runTests(IGameDef *gamedef)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+
 void check_noise_params(const NoiseParams *np1, const NoiseParams *np2)
 {
 	UASSERTEQ(float, np1->offset, np2->offset);
@@ -64,6 +64,7 @@ void check_noise_params(const NoiseParams *np1, const NoiseParams *np2)
 	UASSERTEQ(u32, np1->flags, np2->flags);
 }
 
+
 std::string read_file_to_string(const std::string &filepath)
 {
 	std::string buf;
@@ -88,6 +89,7 @@ std::string read_file_to_string(const std::string &filepath)
 	return buf;
 }
 
+
 void TestMapSettingsManager::makeUserConfig(Settings *conf)
 {
 	conf->set("mg_name", "v7");
@@ -99,17 +101,17 @@ void TestMapSettingsManager::makeUserConfig(Settings *conf)
 	conf->set("mgv5_np_ground", "-43, 40, (80,  80,  80),  983240, 4, 0.55, 2.0");
 }
 
+
 std::string TestMapSettingsManager::makeMetaFile(bool make_corrupt)
 {
 	std::string metafile = getTestTempFile();
 
-	const char *metafile_contents = "mg_name = v5\n"
-					"seed = 1234\n"
-					"mg_flags = light\n"
-					"mgv5_np_filler_depth = 20, 1, (150, 150, 150), "
-					"261, 4, 0.7,  1.0\n"
-					"mgv5_np_height = 20, 10, (250, 250, 250), "
-					"84174,  4, 0.5,  1.0\n";
+	const char *metafile_contents =
+		"mg_name = v5\n"
+		"seed = 1234\n"
+		"mg_flags = light\n"
+		"mgv5_np_filler_depth = 20, 1, (150, 150, 150), 261, 4, 0.7,  1.0\n"
+		"mgv5_np_height = 20, 10, (250, 250, 250), 84174,  4, 0.5,  1.0\n";
 
 	FILE *f = fopen(metafile.c_str(), "wb");
 	UASSERT(f != NULL);
@@ -123,6 +125,7 @@ std::string TestMapSettingsManager::makeMetaFile(bool make_corrupt)
 	return metafile;
 }
 
+
 void TestMapSettingsManager::testMapSettingsManager()
 {
 	Settings user_settings;
@@ -147,7 +150,7 @@ void TestMapSettingsManager::testMapSettingsManager()
 	UASSERT(mgr.getMapSetting("water_level", &value));
 	UASSERT(value == "20");
 
-	// Pretend we have some mapgen settings configured from the scripting
+    // Pretend we have some mapgen settings configured from the scripting
 	UASSERT(mgr.setMapSetting("water_level", "15"));
 	UASSERT(mgr.setMapSetting("seed", "02468"));
 	UASSERT(mgr.setMapSetting("mg_flags", "nolight", true));
@@ -155,12 +158,10 @@ void TestMapSettingsManager::testMapSettingsManager()
 	NoiseParams script_np_filler_depth(0, 100, v3f(200, 100, 200), 261, 4, 0.7, 2.0);
 	NoiseParams script_np_factor(0, 100, v3f(50, 50, 50), 920381, 3, 0.45, 2.0);
 	NoiseParams script_np_height(0, 100, v3f(450, 450, 450), 84174, 4, 0.5, 2.0);
-	NoiseParams meta_np_height(20, 10, v3f(250, 250, 250), 84174, 4, 0.5, 1.0);
-	NoiseParams user_np_ground(
-			-43, 40, v3f(80, 80, 80), 983240, 4, 0.55, 2.0, NOISE_FLAG_EASED);
+	NoiseParams meta_np_height(20, 10, v3f(250, 250, 250), 84174,  4, 0.5,  1.0);
+	NoiseParams user_np_ground(-43, 40, v3f(80,  80,  80),  983240, 4, 0.55, 2.0, NOISE_FLAG_EASED);
 
-	mgr.setMapSettingNoiseParams(
-			"mgv5_np_filler_depth", &script_np_filler_depth, true);
+	mgr.setMapSettingNoiseParams("mgv5_np_filler_depth", &script_np_filler_depth, true);
 	mgr.setMapSettingNoiseParams("mgv5_np_height", &script_np_height);
 	mgr.setMapSettingNoiseParams("mgv5_np_factor", &script_np_factor);
 
@@ -208,11 +209,12 @@ void TestMapSettingsManager::testMapSettingsManager()
 #endif
 }
 
+
 void TestMapSettingsManager::testMapMetaSaveLoad()
 {
 	Settings conf;
-	std::string path = getTestTempDirectory() + DIR_DELIM + "foobar" + DIR_DELIM +
-			   "map_meta.txt";
+	std::string path = getTestTempDirectory()
+		+ DIR_DELIM + "foobar" + DIR_DELIM + "map_meta.txt";
 
 	// Create a set of mapgen params and save them to map meta
 	conf.set("seed", "12345");
@@ -237,6 +239,7 @@ void TestMapSettingsManager::testMapMetaSaveLoad()
 	UASSERTEQ(s16, params2->water_level, 5);
 }
 
+
 void TestMapSettingsManager::testMapMetaFailures()
 {
 	std::string test_mapmeta_path;