Mgv7: Limit mountain height to positive only, for better control of mountain areas

paramat · paramat · commit 4546acfa2195 · 2015-02-18T19:40:15.000Z
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
@@ -361,15 +361,15 @@ float MapgenV7::baseTerrainLevelFromMap(int index)
 
 bool MapgenV7::getMountainTerrainAtPoint(int x, int y, int z)
 {
-	float mnt_h_n = NoisePerlin2D(&noise_mount_height->np, x, z, seed);
+	float mnt_h_n = MYMAX(NoisePerlin2D(&noise_mount_height->np, x, z, seed), 0);
 	float mnt_n = NoisePerlin3D(&noise_mountain->np, x, y, z, seed);
 	return mnt_n * mnt_h_n >= (float)y;
 }
 
 
 bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y)
 {
-	float mounthn = noise_mount_height->result[idx_xz];
+	float mounthn = MYMAX(noise_mount_height->result[idx_xz], 0);
 	float mountn = noise_mountain->result[idx_xyz];
 	return mountn * mounthn >= (float)y;
 }

Original file line number	Diff line number	Diff line change
`@@ -361,15 +361,15 @@ float MapgenV7::baseTerrainLevelFromMap(int index)`
`361`	`361`
`362`	`362`	`bool MapgenV7::getMountainTerrainAtPoint(int x, int y, int z)`
`363`	`363`	`{`
`364`		`- float mnt_h_n = NoisePerlin2D(&noise_mount_height->np, x, z, seed);`
	`364`	`+ float mnt_h_n = MYMAX(NoisePerlin2D(&noise_mount_height->np, x, z, seed), 0);`
`365`	`365`	`float mnt_n = NoisePerlin3D(&noise_mountain->np, x, y, z, seed);`
`366`	`366`	`return mnt_n * mnt_h_n >= (float)y;`
`367`	`367`	`}`
`368`	`368`
`369`	`369`
`370`	`370`	`bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y)`
`371`	`371`	`{`
`372`		`- float mounthn = noise_mount_height->result[idx_xz];`
	`372`	`+ float mounthn = MYMAX(noise_mount_height->result[idx_xz], 0);`
`373`	`373`	`float mountn = noise_mountain->result[idx_xyz];`
`374`	`374`	`return mountn * mounthn >= (float)y;`
`375`	`375`	`}`