Translated using Weblate (Chinese (Taiwan))

[dragonfireclient.git] / src / mapgen_v5.cpp

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index 167a382824d1a8dca7a1a8f3c6cc215203beb3ce..9f189e25399b58f161992293ee15f9acee0dd8aa 100644 (file)
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -45,42 +45,23 @@ FlagDesc flagdesc_mapgen_v5[] = {
 };
 
 
-MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
+MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
        : MapgenBasic(mapgenid, params, emerge)
 {
-       MapgenV5Params *sp = (MapgenV5Params *)params->sparams;
-
-       this->spflags    = sp->spflags;
-       this->cave_width = sp->cave_width;
+       this->spflags    = params->spflags;
+       this->cave_width = params->cave_width;
 
        // Terrain noise
-       noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
-       noise_factor       = new Noise(&sp->np_factor,       seed, csize.X, csize.Z);
-       noise_height       = new Noise(&sp->np_height,       seed, csize.X, csize.Z);
+       noise_filler_depth = new Noise(&params->np_filler_depth, seed, csize.X, csize.Z);
+       noise_factor       = new Noise(&params->np_factor,       seed, csize.X, csize.Z);
+       noise_height       = new Noise(&params->np_height,       seed, csize.X, csize.Z);
 
        // 3D terrain noise
        // 1-up 1-down overgeneration
-       noise_ground = new Noise(&sp->np_ground, seed, csize.X, csize.Y + 2, csize.Z);
-
-       MapgenBasic::np_cave1 = sp->np_cave1;
-       MapgenBasic::np_cave2 = sp->np_cave2;
-
-       // Content used for dungeon generation
-       c_cobble               = ndef->getId("mapgen_cobble");
-       c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-       c_mossycobble          = ndef->getId("mapgen_mossycobble");
-       c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-       c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
-
-       // Fall back to more basic content if not defined
-       if (c_mossycobble == CONTENT_IGNORE)
-               c_mossycobble = c_cobble;
-       if (c_stair_cobble == CONTENT_IGNORE)
-               c_stair_cobble = c_cobble;
-       if (c_sandstonebrick == CONTENT_IGNORE)
-               c_sandstonebrick = c_sandstone;
-       if (c_stair_sandstonebrick == CONTENT_IGNORE)
-               c_stair_sandstonebrick = c_sandstone;
+       noise_ground = new Noise(&params->np_ground, seed, csize.X, csize.Y + 2, csize.Z);
+
+       MapgenBasic::np_cave1 = params->np_cave1;
+       MapgenBasic::np_cave2 = params->np_cave2;
 }
 
 
@@ -207,7 +188,6 @@ void MapgenV5::makeChunk(BlockMakeData *data)
 
        // Init biome generator, place biome-specific nodes, and build biomemap
        biomegen->calcBiomeNoise(node_min);
-       biomegen->getBiomes(heightmap);
        MgStoneType stone_type = generateBiomes();
 
        // Generate caves
@@ -215,48 +195,8 @@ void MapgenV5::makeChunk(BlockMakeData *data)
                generateCaves(stone_surface_max_y, MGV5_LARGE_CAVE_DEPTH);
 
        // Generate dungeons and desert temples
-       if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
-               DungeonParams dp;
-
-               dp.np_rarity  = nparams_dungeon_rarity;
-               dp.np_density = nparams_dungeon_density;
-               dp.np_wetness = nparams_dungeon_wetness;
-               dp.c_water    = c_water_source;
-               if (stone_type == MGSTONE_STONE) {
-                       dp.c_cobble = c_cobble;
-                       dp.c_moss   = c_mossycobble;
-                       dp.c_stair  = c_stair_cobble;
-
-                       dp.diagonal_dirs = false;
-                       dp.mossratio     = 3.0;
-                       dp.holesize      = v3s16(1, 2, 1);
-                       dp.roomsize      = v3s16(0, 0, 0);
-                       dp.notifytype    = GENNOTIFY_DUNGEON;
-               } else if (stone_type == MGSTONE_DESERT_STONE) {
-                       dp.c_cobble = c_desert_stone;
-                       dp.c_moss   = c_desert_stone;
-                       dp.c_stair  = c_desert_stone;
-
-                       dp.diagonal_dirs = true;
-                       dp.mossratio     = 0.0;
-                       dp.holesize      = v3s16(2, 3, 2);
-                       dp.roomsize      = v3s16(2, 5, 2);
-                       dp.notifytype    = GENNOTIFY_TEMPLE;
-               } else if (stone_type == MGSTONE_SANDSTONE) {
-                       dp.c_cobble = c_sandstonebrick;
-                       dp.c_moss   = c_sandstonebrick;
-                       dp.c_stair  = c_sandstonebrick;
-
-                       dp.diagonal_dirs = false;
-                       dp.mossratio     = 0.0;
-                       dp.holesize      = v3s16(2, 2, 2);
-                       dp.roomsize      = v3s16(2, 0, 2);
-                       dp.notifytype    = GENNOTIFY_DUNGEON;
-               }
-
-               DungeonGen dgen(this, &dp);
-               dgen.generate(blockseed, full_node_min, full_node_max);
-       }
+       if (flags & MG_DUNGEONS)
+               generateDungeons(stone_surface_max_y, stone_type);
 
        // Generate the registered decorations
        if (flags & MG_DECORATIONS)