X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapgen%2Fmapgen.cpp;h=2a6bcf3470ff49a9498b54049738a32d01105a2a;hb=37923920a07f06d201662d8f1f4e5821efcc7b09;hp=d967d428a0c591ce4ec644e76db19d21ff8569c6;hpb=142474196a86bf7d04f24ce4571c6b743be72595;p=oweals%2Fminetest.git diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp index d967d428a..2a6bcf347 100644 --- a/src/mapgen/mapgen.cpp +++ b/src/mapgen/mapgen.cpp @@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include "mapgen.h" #include "voxel.h" #include "noise.h" @@ -56,7 +57,8 @@ FlagDesc flagdesc_mapgen[] = { {"dungeons", MG_DUNGEONS}, {"light", MG_LIGHT}, {"decorations", MG_DECORATIONS}, - {NULL, 0} + {"biomes", MG_BIOMES}, + {NULL, 0} }; FlagDesc flagdesc_gennotify[] = { @@ -79,15 +81,21 @@ struct MapgenDesc { //// Built-in mapgens //// +// Order used here defines the order of appearence in mainmenu. +// v6 always last to discourage selection. +// Special mapgens flat, fractal, singlenode, next to last. Of these, singlenode +// last to discourage selection. +// Of the remaining, v5 last due to age, v7 first due to being the default. +// The order of 'enum MapgenType' in mapgen.h must match this order. static MapgenDesc g_reg_mapgens[] = { - {"v5", true}, - {"v6", true}, {"v7", true}, + {"valleys", true}, + {"carpathian", true}, + {"v5", true}, {"flat", true}, {"fractal", true}, - {"valleys", true}, {"singlenode", true}, - {"carpathian", true}, + {"v6", true}, }; STATIC_ASSERT( @@ -147,28 +155,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; } } @@ -193,7 +201,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype) case MAPGEN_VALLEYS: return new MapgenValleysParams; default: - return NULL; + return nullptr; } } @@ -238,7 +246,7 @@ s16 Mapgen::findGroundLevelFull(v2s16 p2d) if (ndef->get(n).walkable) break; - vm->m_area.add_y(em, i, -1); + VoxelArea::add_y(em, i, -1); } return (y >= y_nodes_min) ? y : y_nodes_min - 1; } @@ -256,7 +264,7 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax) if (ndef->get(n).walkable) break; - vm->m_area.add_y(em, i, -1); + VoxelArea::add_y(em, i, -1); } return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT; } @@ -277,7 +285,7 @@ s16 Mapgen::findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax) if (ndef->get(n).isLiquid()) break; - vm->m_area.add_y(em, i, -1); + VoxelArea::add_y(em, i, -1); } return (y >= ymin) ? y : -MAX_MAP_GENERATION_LIMIT; } @@ -309,7 +317,7 @@ void Mapgen::getSurfaces(v2s16 p2d, s16 ymin, s16 ymax, u32 vi = vm->m_area.index(p2d.X, ymax, p2d.Y); MapNode mn_max = vm->m_data[vi]; bool walkable_above = ndef->get(mn_max).walkable; - vm->m_area.add_y(em, vi, -1); + VoxelArea::add_y(em, vi, -1); for (s16 y = ymax - 1; y >= ymin; y--) { MapNode mn = vm->m_data[vi]; @@ -321,7 +329,7 @@ void Mapgen::getSurfaces(v2s16 p2d, s16 ymin, s16 ymax, ceilings.push_back(y + 1); } - vm->m_area.add_y(em, vi, -1); + VoxelArea::add_y(em, vi, -1); walkable_above = is_walkable; } } @@ -330,28 +338,28 @@ void Mapgen::getSurfaces(v2s16 p2d, s16 ymin, s16 ymax, inline bool Mapgen::isLiquidHorizontallyFlowable(u32 vi, v3s16 em) { u32 vi_neg_x = vi; - vm->m_area.add_x(em, vi_neg_x, -1); + VoxelArea::add_x(em, vi_neg_x, -1); if (vm->m_data[vi_neg_x].getContent() != CONTENT_IGNORE) { const ContentFeatures &c_nx = ndef->get(vm->m_data[vi_neg_x]); if (c_nx.floodable && !c_nx.isLiquid()) return true; } u32 vi_pos_x = vi; - vm->m_area.add_x(em, vi_pos_x, +1); + VoxelArea::add_x(em, vi_pos_x, +1); if (vm->m_data[vi_pos_x].getContent() != CONTENT_IGNORE) { const ContentFeatures &c_px = ndef->get(vm->m_data[vi_pos_x]); if (c_px.floodable && !c_px.isLiquid()) return true; } u32 vi_neg_z = vi; - vm->m_area.add_z(em, vi_neg_z, -1); + VoxelArea::add_z(em, vi_neg_z, -1); if (vm->m_data[vi_neg_z].getContent() != CONTENT_IGNORE) { const ContentFeatures &c_nz = ndef->get(vm->m_data[vi_neg_z]); if (c_nz.floodable && !c_nz.isLiquid()) return true; } u32 vi_pos_z = vi; - vm->m_area.add_z(em, vi_pos_z, +1); + VoxelArea::add_z(em, vi_pos_z, +1); if (vm->m_data[vi_pos_z].getContent() != CONTENT_IGNORE) { const ContentFeatures &c_pz = ndef->get(vm->m_data[vi_pos_z]); if (c_pz.floodable && !c_pz.isLiquid()) @@ -395,7 +403,7 @@ void Mapgen::updateLiquid(UniqueQueue *trans_liquid, v3s16 nmin, v3s16 nm } else { // This is the topmost node below a liquid column u32 vi_above = vi; - vm->m_area.add_y(em, vi_above, 1); + VoxelArea::add_y(em, vi_above, 1); if (!waspushed && (ndef->get(vm->m_data[vi]).floodable || (!waschecked && isLiquidHorizontallyFlowable(vi_above, em)))) { // Push back the lowest node in the column which is one @@ -406,7 +414,7 @@ void Mapgen::updateLiquid(UniqueQueue *trans_liquid, v3s16 nmin, v3s16 nm wasliquid = isliquid; wasignored = isignored; - vm->m_area.add_y(em, vi, -1); + VoxelArea::add_y(em, vi, -1); } } } @@ -502,14 +510,14 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow) propagate_shadow) { continue; } - vm->m_area.add_y(em, i, -1); + VoxelArea::add_y(em, i, -1); for (int y = a.MaxEdge.Y; y >= a.MinEdge.Y; y--) { MapNode &n = vm->m_data[i]; if (!ndef->get(n).sunlight_propagates) break; n.param1 = LIGHT_SUN; - vm->m_area.add_y(em, i, -1); + VoxelArea::add_y(em, i, -1); } } } @@ -591,45 +599,20 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer this->heightmap = new s16[csize.X * csize.Z]; //// Initialize biome generator - // TODO(hmmmm): should we have a way to disable biomemanager biomes? biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize); biomemap = biomegen->biomemap; //// Look up some commonly used content c_stone = ndef->getId("mapgen_stone"); - c_desert_stone = ndef->getId("mapgen_desert_stone"); - c_sandstone = ndef->getId("mapgen_sandstone"); c_water_source = ndef->getId("mapgen_water_source"); c_river_water_source = ndef->getId("mapgen_river_water_source"); c_lava_source = ndef->getId("mapgen_lava_source"); + c_cobble = ndef->getId("mapgen_cobble"); - // Fall back to more basic content if not defined - // river_water_source cannot fallback to water_source because river water - // needs to be non-renewable and have a short flow range. - if (c_desert_stone == CONTENT_IGNORE) - c_desert_stone = c_stone; - if (c_sandstone == CONTENT_IGNORE) - c_sandstone = c_stone; - - //// Content used for dungeon generation - c_cobble = ndef->getId("mapgen_cobble"); - c_mossycobble = ndef->getId("mapgen_mossycobble"); - c_stair_cobble = ndef->getId("mapgen_stair_cobble"); - c_stair_desert_stone = ndef->getId("mapgen_stair_desert_stone"); - c_sandstonebrick = ndef->getId("mapgen_sandstonebrick"); - c_stair_sandstone_block = ndef->getId("mapgen_stair_sandstone_block"); - - // 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_stair_desert_stone == CONTENT_IGNORE) - c_stair_desert_stone = c_desert_stone; - if (c_sandstonebrick == CONTENT_IGNORE) - c_sandstonebrick = c_sandstone; - if (c_stair_sandstone_block == CONTENT_IGNORE) - c_stair_sandstone_block = c_sandstonebrick; + // Fall back to more basic content if not defined. + // Lava falls back to water as both are suitable as cave liquids. + if (c_lava_source == CONTENT_IGNORE) + c_lava_source = c_water_source; } @@ -640,8 +623,7 @@ MapgenBasic::~MapgenBasic() } -void MapgenBasic::generateBiomes(MgStoneType *mgstone_type, - content_t *biome_stone) +void MapgenBasic::generateBiomes() { // can't generate biomes without a biome generator! assert(biomegen); @@ -649,14 +631,13 @@ void MapgenBasic::generateBiomes(MgStoneType *mgstone_type, const v3s16 &em = vm->m_area.getExtent(); u32 index = 0; - MgStoneType stone_type = MGSTONE_OTHER; - content_t c_biome_stone = c_stone; noise_filler_depth->perlinMap2D(node_min.X, node_min.Z); 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; @@ -693,29 +674,24 @@ void MapgenBasic::generateBiomes(MgStoneType *mgstone_type, if (is_stone_surface || is_water_surface) { // (Re)calculate biome - biome = biomegen->getBiomeAtIndex(index, y); + biome = biomegen->getBiomeAtIndex(index, v3s16(x, y, z)); + // Add biome to biomemap at first stone surface detected 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 + noise_filler_depth->result[index], 0.0f); depth_water_top = biome->depth_water_top; depth_riverbed = biome->depth_riverbed; - biome_y_min = biome->y_min; - - // Detect stone type for dungeons during every biome calculation. - // If none detected the last selected biome stone is chosen. - if (biome->c_stone == c_stone) - stone_type = MGSTONE_STONE; - else if (biome->c_stone == c_desert_stone) - stone_type = MGSTONE_DESERT_STONE; - else if (biome->c_stone == c_sandstone) - stone_type = MGSTONE_SANDSTONE; - - c_biome_stone = biome->c_stone; + biome_y_min = biome->min_pos.Y; } if (c == c_stone) { @@ -773,12 +749,14 @@ void MapgenBasic::generateBiomes(MgStoneType *mgstone_type, water_above = false; } - vm->m_area.add_y(em, vi, -1); + VoxelArea::add_y(em, vi, -1); } + // 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; } - - *mgstone_type = stone_type; - *biome_stone = c_biome_stone; } @@ -797,6 +775,10 @@ void MapgenBasic::dustTopNodes() if (biome->c_dust == CONTENT_IGNORE) continue; + // Check if mapchunk above has generated, if so, drop dust from 16 nodes + // above current mapchunk top, above decorations that will extend above + // the current mapchunk. If the mapchunk above has not generated, it + // will provide this required dust when it does. u32 vi = vm->m_area.index(x, full_node_max.Y, z); content_t c_full_max = vm->m_data[vi].getContent(); s16 y_start; @@ -820,52 +802,59 @@ void MapgenBasic::dustTopNodes() if (vm->m_data[vi].getContent() != CONTENT_AIR) break; - vm->m_area.add_y(em, vi, -1); + VoxelArea::add_y(em, vi, -1); } content_t c = vm->m_data[vi].getContent(); NodeDrawType dtype = ndef->get(c).drawtype; - // Only place on walkable cubic non-liquid nodes - // Dust check needed due to vertical overgeneration + // Only place on cubic, walkable, non-dust nodes. + // Dust check needed due to avoid double layer of dust caused by + // dropping dust from 16 nodes above mapchunk top. if ((dtype == NDT_NORMAL || + dtype == NDT_ALLFACES || dtype == NDT_ALLFACES_OPTIONAL || - dtype == NDT_GLASSLIKE_FRAMED_OPTIONAL || dtype == NDT_GLASSLIKE || dtype == NDT_GLASSLIKE_FRAMED || - dtype == NDT_ALLFACES) && + dtype == NDT_GLASSLIKE_FRAMED_OPTIONAL) && ndef->get(c).walkable && c != biome->c_dust) { - vm->m_area.add_y(em, vi, 1); + VoxelArea::add_y(em, vi, 1); vm->m_data[vi] = MapNode(biome->c_dust); } } } -void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth) +void MapgenBasic::generateCavesNoiseIntersection(s16 max_stone_y) { - if (max_stone_y < node_min.Y) + if (node_min.Y > max_stone_y) return; CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize, &np_cave1, &np_cave2, seed, cave_width); caves_noise.generateCaves(vm, node_min, node_max, biomemap); +} + - if (node_max.Y > large_cave_depth) +void MapgenBasic::generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth) +{ + if (node_min.Y > max_stone_y || node_max.Y > large_cave_depth) return; PseudoRandom ps(blockseed + 21343); u32 bruises_count = ps.range(0, 2); + for (u32 i = 0; i < bruises_count; i++) { CavesRandomWalk cave(ndef, &gennotify, seed, water_level, - c_water_source, CONTENT_IGNORE, lava_depth); + c_water_source, c_lava_source, lava_depth, biomegen); - cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, heightmap); + cave.makeCave(vm, node_min, node_max, &ps, true, max_stone_y, + heightmap); } } -bool MapgenBasic::generateCaverns(s16 max_stone_y) +bool MapgenBasic::generateCavernsNoise(s16 max_stone_y) { if (node_min.Y > max_stone_y || node_min.Y > cavern_limit) return false; @@ -877,83 +866,62 @@ bool MapgenBasic::generateCaverns(s16 max_stone_y) } -void MapgenBasic::generateDungeons(s16 max_stone_y, - MgStoneType stone_type, content_t biome_stone) +void MapgenBasic::generateDungeons(s16 max_stone_y) { if (max_stone_y < node_min.Y) return; - DungeonParams dp; - - dp.seed = seed; - dp.c_water = c_water_source; - dp.c_river_water = c_river_water_source; - - dp.only_in_ground = true; - dp.corridor_len_min = 1; - dp.corridor_len_max = 13; - dp.rooms_min = 2; - dp.rooms_max = 16; - dp.y_min = -MAX_MAP_GENERATION_LIMIT; - dp.y_max = MAX_MAP_GENERATION_LIMIT; + u16 num_dungeons = std::fmax(std::floor( + NoisePerlin3D(&np_dungeons, node_min.X, node_min.Y, node_min.Z, seed)), 0.0f); + if (num_dungeons == 0) + return; - dp.np_density = nparams_dungeon_density; - dp.np_alt_wall = nparams_dungeon_alt_wall; + PseudoRandom ps(blockseed + 70033); + + DungeonParams dp; - switch (stone_type) { - default: - case MGSTONE_STONE: - dp.c_wall = c_cobble; - dp.c_alt_wall = c_mossycobble; - dp.c_stair = c_stair_cobble; - - dp.diagonal_dirs = false; - dp.holesize = v3s16(1, 2, 1); - dp.room_size_min = v3s16(4, 4, 4); - dp.room_size_max = v3s16(8, 6, 8); - dp.room_size_large_min = v3s16(8, 8, 8); - dp.room_size_large_max = v3s16(16, 16, 16); - dp.notifytype = GENNOTIFY_DUNGEON; - break; - case MGSTONE_DESERT_STONE: - dp.c_wall = c_desert_stone; - dp.c_alt_wall = CONTENT_IGNORE; - dp.c_stair = c_stair_desert_stone; - - dp.diagonal_dirs = true; - dp.holesize = v3s16(2, 3, 2); - dp.room_size_min = v3s16(6, 9, 6); - dp.room_size_max = v3s16(10, 11, 10); - dp.room_size_large_min = v3s16(10, 13, 10); - dp.room_size_large_max = v3s16(18, 21, 18); - dp.notifytype = GENNOTIFY_TEMPLE; - break; - case MGSTONE_SANDSTONE: - dp.c_wall = c_sandstonebrick; - dp.c_alt_wall = CONTENT_IGNORE; - dp.c_stair = c_stair_sandstone_block; - - dp.diagonal_dirs = false; - dp.holesize = v3s16(2, 2, 2); - dp.room_size_min = v3s16(6, 4, 6); - dp.room_size_max = v3s16(10, 6, 10); - dp.room_size_large_min = v3s16(10, 8, 10); - dp.room_size_large_max = v3s16(18, 16, 18); - dp.notifytype = GENNOTIFY_DUNGEON; - break; - case MGSTONE_OTHER: - dp.c_wall = biome_stone; - dp.c_alt_wall = biome_stone; - dp.c_stair = biome_stone; - - dp.diagonal_dirs = false; - dp.holesize = v3s16(1, 2, 1); - dp.room_size_min = v3s16(4, 4, 4); - dp.room_size_max = v3s16(8, 6, 8); - dp.room_size_large_min = v3s16(8, 8, 8); - dp.room_size_large_max = v3s16(16, 16, 16); - dp.notifytype = GENNOTIFY_DUNGEON; - break; + dp.np_alt_wall = + NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0); + + dp.seed = seed; + dp.num_dungeons = num_dungeons; + dp.only_in_ground = true; + dp.num_rooms = ps.range(2, 16); + dp.room_size_min = v3s16(6, 5, 6); + dp.room_size_max = v3s16(10, 6, 10); + dp.room_size_large_min = v3s16(10, 8, 10); + dp.room_size_large_max = v3s16(18, 16, 18); + dp.large_room_chance = (ps.range(1, 4) == 1) ? 1 : 0; + dp.holesize = v3s16(2, 3, 2); + dp.corridor_len_min = 1; + dp.corridor_len_max = 13; + dp.diagonal_dirs = ps.range(1, 12) == 1; + dp.notifytype = GENNOTIFY_DUNGEON; + + // Get biome at mapchunk midpoint + v3s16 chunk_mid = node_min + (node_max - node_min) / v3s16(2, 2, 2); + Biome *biome = (Biome *)biomegen->getBiomeAtPoint(chunk_mid); + + // Use biome-defined dungeon nodes if defined + if (biome->c_dungeon != CONTENT_IGNORE) { + dp.c_wall = biome->c_dungeon; + // If 'node_dungeon_alt' is not defined by biome, it and dp.c_alt_wall + // become CONTENT_IGNORE which skips the alt wall node placement loop in + // dungeongen.cpp. + dp.c_alt_wall = biome->c_dungeon_alt; + // Stairs fall back to 'c_dungeon' if not defined by biome + dp.c_stair = (biome->c_dungeon_stair != CONTENT_IGNORE) ? + biome->c_dungeon_stair : biome->c_dungeon; + // Fallback to using cobble mapgen alias if defined + } else if (c_cobble != CONTENT_IGNORE) { + dp.c_wall = c_cobble; + dp.c_alt_wall = CONTENT_IGNORE; + dp.c_stair = c_cobble; + // Fallback to using biome-defined stone + } else { + dp.c_wall = biome->c_stone; + dp.c_alt_wall = CONTENT_IGNORE; + dp.c_stair = biome->c_stone; } DungeonGen dgen(ndef, &gennotify, &dp); @@ -1005,8 +973,7 @@ bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos, u32 id) void GenerateNotifier::getEvents( - std::map > &event_map, - bool peek_events) + std::map > &event_map) { std::list::iterator it; @@ -1018,9 +985,12 @@ void GenerateNotifier::getEvents( event_map[name].push_back(gn.pos); } +} - if (!peek_events) - m_notify_events.clear(); + +void GenerateNotifier::clearEvents() +{ + m_notify_events.clear(); } @@ -1081,13 +1051,11 @@ void MapgenParams::writeParams(Settings *settings) const bparams->writeParams(settings); } -// Calculate edges of outermost generated mapchunks (less than -// 'mapgen_limit'), and corresponding exact limits for SAO entities. + +// Calculate exact edges of the outermost mapchunks that are within the +// set 'mapgen_limit'. void MapgenParams::calcMapgenEdges() { - if (m_mapgen_edges_calculated) - return; - // Central chunk offset, in blocks s16 ccoff_b = -chunksize / 2; // Chunksize, in nodes @@ -1112,31 +1080,15 @@ void MapgenParams::calcMapgenEdges() // Mapgen edges, in nodes mapgen_edge_min = ccmin - numcmin * csize_n; mapgen_edge_max = ccmax + numcmax * csize_n; - // SAO position limits, in Irrlicht units - m_sao_limit_min = mapgen_edge_min * BS - 3.0f; - m_sao_limit_max = mapgen_edge_max * BS + 3.0f; m_mapgen_edges_calculated = true; } -bool MapgenParams::saoPosOverLimit(const v3f &p) +s32 MapgenParams::getSpawnRangeMax() { if (!m_mapgen_edges_calculated) calcMapgenEdges(); - return p.X < m_sao_limit_min || - p.X > m_sao_limit_max || - p.Y < m_sao_limit_min || - p.Y > m_sao_limit_max || - p.Z < m_sao_limit_min || - p.Z > m_sao_limit_max; -} - - -s32 MapgenParams::getSpawnRangeMax() -{ - calcMapgenEdges(); - return MYMIN(-mapgen_edge_min, mapgen_edge_max); }