Fix comments

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

diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index 360afd89719f4143ca3a7afbf29584209e0a0160..bdbbc01f76b774bc26074a524babde87391e07ee 100644 (file)
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -148,28 +148,28 @@ const char *Mapgen::getMapgenName(MapgenType mgtype)
 }
 
 
-Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
-       MapgenParams *params, EmergeManager *emerge)
+Mapgen *Mapgen::createMapgen(MapgenType mgtype, MapgenParams *params,
+       EmergeManager *emerge)
 {
        switch (mgtype) {
        case MAPGEN_CARPATHIAN:
-               return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
+               return new MapgenCarpathian((MapgenCarpathianParams *)params, emerge);
        case MAPGEN_FLAT:
-               return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
+               return new MapgenFlat((MapgenFlatParams *)params, emerge);
        case MAPGEN_FRACTAL:
-               return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
+               return new MapgenFractal((MapgenFractalParams *)params, emerge);
        case MAPGEN_SINGLENODE:
-               return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
+               return new MapgenSinglenode((MapgenSinglenodeParams *)params, emerge);
        case MAPGEN_V5:
-               return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
+               return new MapgenV5((MapgenV5Params *)params, emerge);
        case MAPGEN_V6:
-               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
+               return new MapgenV6((MapgenV6Params *)params, emerge);
        case MAPGEN_V7:
-               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+               return new MapgenV7((MapgenV7Params *)params, emerge);
        case MAPGEN_VALLEYS:
-               return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
+               return new MapgenValleys((MapgenValleysParams *)params, emerge);
        default:
-               return NULL;
+               return nullptr;
        }
 }
 
@@ -194,7 +194,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
        case MAPGEN_VALLEYS:
                return new MapgenValleysParams;
        default:
-               return NULL;
+               return nullptr;
        }
 }
 
@@ -655,6 +655,7 @@ void MapgenBasic::generateBiomes()
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
                Biome *biome = NULL;
+               biome_t water_biome_index = 0;
                u16 depth_top = 0;
                u16 base_filler = 0;
                u16 depth_water_top = 0;
@@ -697,6 +698,11 @@ void MapgenBasic::generateBiomes()
                                if (biomemap[index] == BIOME_NONE && is_stone_surface)
                                        biomemap[index] = biome->index;
 
+                               // Store biome of first water surface detected, as a fallback
+                               // entry for the biomemap.
+                               if (water_biome_index == 0 && is_water_surface)
+                                       water_biome_index = biome->index;
+
                                depth_top = biome->depth_top;
                                base_filler = MYMAX(depth_top +
                                        biome->depth_filler +
@@ -763,16 +769,11 @@ void MapgenBasic::generateBiomes()
 
                        VoxelArea::add_y(em, vi, -1);
                }
-               // If no stone surface was detected in this mapchunk column the biomemap
-               // will be empty for this (x, z) position. Add the currently active
-               // biome to the biomemap, or if biome is NULL calculate it for this
-               // position and add it.
-               if (biomemap[index] == BIOME_NONE) {
-                       if (!biome)
-                               biome = biomegen->getBiomeAtIndex(
-                                       index, v3s16(x, node_min.Y, z));
-                       biomemap[index] = biome->index;
-               }
+               // If no stone surface detected in mapchunk column and a water surface
+               // biome fallback exists, add it to the biomemap. This avoids water
+               // surface decorations failing in deep water.
+               if (biomemap[index] == BIOME_NONE && water_biome_index != 0)
+                       biomemap[index] = water_biome_index;
        }
 }