MapgenValleys: Fixed submarine valleys shape

gaelysam · paramat · commit b952d42000a4 · 2018-03-03T22:59:26.000Z
diff --git a/src/mapgen/mapgen_valleys.cpp b/src/mapgen/mapgen_valleys.cpp
@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_decoration.h"
 #include "mapgen_valleys.h"
 #include "cavegen.h"
+#include <cmath>
 
 
 //#undef NDEBUG
@@ -373,7 +374,7 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn)
 	//   (here x = "river" and a = valley_profile).
 	//  "valley" represents the height of the terrain, from the rivers.
 	{
-		float t = river / tn->valley_profile;
+		float t = std::fmax(river / tn->valley_profile, 0.0f);
 		*tn->valley = valley_d * (1.f - exp(- MYSQUARE(t)));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`40`	`40`	`#include "mg_decoration.h"`
`41`	`41`	`#include "mapgen_valleys.h"`
`42`	`42`	`#include "cavegen.h"`
	`43`	`+#include <cmath>`
`43`	`44`
`44`	`45`
`45`	`46`	`//#undef NDEBUG`
`@@ -373,7 +374,7 @@ float MapgenValleys::terrainLevelFromNoise(TerrainNoise *tn)`
`373`	`374`	`// (here x = "river" and a = valley_profile).`
`374`	`375`	`// "valley" represents the height of the terrain, from the rivers.`
`375`	`376`	`{`
`376`		`- float t = river / tn->valley_profile;`
	`377`	`+ float t = std::fmax(river / tn->valley_profile, 0.0f);`
`377`	`378`	`tn->valley = valley_d (1.f - exp(- MYSQUARE(t)));`
`378`	`379`	`}`
`379`	`380`