Give the Mapgen on each EmergeThread its own Biome/Ore/Deco/SchemManager copy

[dragonfireclient.git] / src / mapgen / mapgen_valleys.cpp

diff --git a/src/mapgen/mapgen_valleys.cpp b/src/mapgen/mapgen_valleys.cpp
index 2b8703fa5ddc386a195743b8091d521854395e0e..efcc8ee85fa491c1cb5133ba5a804f217d4b2d8e 100644 (file)
--- a/src/mapgen/mapgen_valleys.cpp
+++ b/src/mapgen/mapgen_valleys.cpp
@@ -54,7 +54,7 @@ FlagDesc flagdesc_mapgen_valleys[] = {
 };
 
 
-MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeManager *emerge)
+MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeParams *emerge)
        : MapgenBasic(MAPGEN_VALLEYS, params, emerge)
 {
        // NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
@@ -390,7 +390,7 @@ int MapgenValleys::generateTerrain()
 
                // Rivers are placed where 'river' is negative
                if (river < 0.0f) {
-                       // Use the the function -sqrt(1-x^2) which models a circle
+                       // Use the function -sqrt(1-x^2) which models a circle
                        float tr = river / river_size_factor + 1.0f;
                        float depth = (river_depth_bed *
                                std::sqrt(std::fmax(0.0f, 1.0f - tr * tr)));