Mgv7: Lower base of mountain generation to -112 and define constant

paramat · paramat · commit d786a272c0a4 · 2015-07-04T20:21:19.000+01:00
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
@@ -363,7 +363,7 @@ void MapgenV7::calculateNoise()
 		noise_ridge_uwater->perlinMap2D(x, z);
 	}
 
-	if ((spflags & MGV7_MOUNTAINS) && node_max.Y >= 0) {
+	if ((spflags & MGV7_MOUNTAINS) && node_max.Y >= MOUNTAIN_BASE) {
 		noise_mountain->perlinMap3D(x, y, z);
 		noise_mount_height->perlinMap2D(x, z);
 	}
@@ -536,7 +536,7 @@ int MapgenV7::generateBaseTerrain()
 
 int MapgenV7::generateMountainTerrain(int ymax)
 {
-	if (node_max.Y < 0)
+	if (node_max.Y < MOUNTAIN_BASE)
 		return ymax;
 
 	MapNode n_stone(c_stone);
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
+#define MOUNTAIN_BASE -112
+
 /////////////////// Mapgen V7 flags
 #define MGV7_MOUNTAINS   0x01
 #define MGV7_RIDGES      0x02

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ void MapgenV7::calculateNoise()`
`363`	`363`	`noise_ridge_uwater->perlinMap2D(x, z);`
`364`	`364`	`}`
`365`	`365`
`366`		`- if ((spflags & MGV7_MOUNTAINS) && node_max.Y >= 0) {`
	`366`	`+ if ((spflags & MGV7_MOUNTAINS) && node_max.Y >= MOUNTAIN_BASE) {`
`367`	`367`	`noise_mountain->perlinMap3D(x, y, z);`
`368`	`368`	`noise_mount_height->perlinMap2D(x, z);`
`369`	`369`	`}`
`@@ -536,7 +536,7 @@ int MapgenV7::generateBaseTerrain()`
`536`	`536`
`537`	`537`	`int MapgenV7::generateMountainTerrain(int ymax)`
`538`	`538`	`{`
`539`		`- if (node_max.Y < 0)`
	`539`	`+ if (node_max.Y < MOUNTAIN_BASE)`
`540`	`540`	`return ymax;`
`541`	`541`
`542`	`542`	`MapNode n_stone(c_stone);`