aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2018-05-20 23:45:53 +0100
committerGitHub <noreply@github.com>2018-05-20 23:45:53 +0100
commit53d5b3ea40ce1c18540a378c5f71f4e1e60dbec8 (patch)
treeb6d3cf40405389e3831e98fad5c7c164513a2428 /src
parent22df02d25bb1ddb1de48e645c5256621ce9a9ed9 (diff)
downloadminetest-53d5b3ea40ce1c18540a378c5f71f4e1e60dbec8.tar.gz
minetest-53d5b3ea40ce1c18540a378c5f71f4e1e60dbec8.tar.bz2
minetest-53d5b3ea40ce1c18540a378c5f71f4e1e60dbec8.zip
Dungeons: Fix duplication of y limit parameters (#7359)
Diffstat (limited to 'src')
-rw-r--r--src/mapgen/dungeongen.cpp4
-rw-r--r--src/mapgen/dungeongen.h2
-rw-r--r--src/mapgen/mapgen.cpp2
-rw-r--r--src/mapgen/mapgen_v6.cpp3
4 files changed, 0 insertions, 11 deletions
diff --git a/src/mapgen/dungeongen.cpp b/src/mapgen/dungeongen.cpp
index df51c4a1e..32bea4caa 100644
--- a/src/mapgen/dungeongen.cpp
+++ b/src/mapgen/dungeongen.cpp
@@ -71,8 +71,6 @@ DungeonGen::DungeonGen(const NodeDefManager *ndef,
dp.room_size_large_max = v3s16(16, 16, 16);
dp.rooms_min = 2;
dp.rooms_max = 16;
- dp.y_min = -MAX_MAP_GENERATION_LIMIT;
- dp.y_max = MAX_MAP_GENERATION_LIMIT;
dp.notifytype = GENNOTIFY_DUNGEON;
dp.np_density = nparams_dungeon_density;
@@ -86,8 +84,6 @@ void DungeonGen::generate(MMVManip *vm, u32 bseed, v3s16 nmin, v3s16 nmax)
assert(vm);
//TimeTaker t("gen dungeons");
- if (nmin.Y < dp.y_min || nmax.Y > dp.y_max)
- return;
float nval_density = NoisePerlin3D(&dp.np_density, nmin.X, nmin.Y, nmin.Z, dp.seed);
if (nval_density < 1.0f)
diff --git a/src/mapgen/dungeongen.h b/src/mapgen/dungeongen.h
index 1e3d8375d..ad32cf192 100644
--- a/src/mapgen/dungeongen.h
+++ b/src/mapgen/dungeongen.h
@@ -56,8 +56,6 @@ struct DungeonParams {
v3s16 room_size_large_max;
u16 rooms_min;
u16 rooms_max;
- s16 y_min;
- s16 y_max;
GenNotifyType notifytype;
NoiseParams np_density;
diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index eb562e769..6ffe0ec1e 100644
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -883,8 +883,6 @@ void MapgenBasic::generateDungeons(s16 max_stone_y)
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;
dp.np_density = nparams_dungeon_density;
dp.np_alt_wall = nparams_dungeon_alt_wall;
diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp
index ae6c2ad9b..fdfebe575 100644
--- a/src/mapgen/mapgen_v6.cpp
+++ b/src/mapgen/mapgen_v6.cpp
@@ -564,14 +564,11 @@ void MapgenV6::makeChunk(BlockMakeData *data)
DungeonParams dp;
dp.seed = seed;
-
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;
dp.np_density
= NoiseParams(0.9, 0.5, v3f(500.0, 500.0, 500.0), 0, 2, 0.8, 2.0);