diff options
Diffstat (limited to 'src/mg_ore.cpp')
| -rw-r--r-- | src/mg_ore.cpp | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp index 4f4c9c711..979135ed4 100644 --- a/src/mg_ore.cpp +++ b/src/mg_ore.cpp @@ -433,14 +433,16 @@ void OreStratum::generate(MMVManip *vm, int mapseed, u32 blockseed, PcgRandom pr(blockseed + 4234); MapNode n_ore(c_ore, 0, ore_param2); - if (!noise) { - int sx = nmax.X - nmin.X + 1; - int sz = nmax.Z - nmin.Z + 1; - noise = new Noise(&np, 0, sx, sz); - noise_stratum_thickness = new Noise(&np_stratum_thickness, 0, sx, sz); + if (flags & OREFLAG_USE_NOISE) { + if (!(noise && noise_stratum_thickness)) { + int sx = nmax.X - nmin.X + 1; + int sz = nmax.Z - nmin.Z + 1; + noise = new Noise(&np, 0, sx, sz); + noise_stratum_thickness = new Noise(&np_stratum_thickness, 0, sx, sz); + } + noise->perlinMap2D(nmin.X, nmin.Z); + noise_stratum_thickness->perlinMap2D(nmin.X, nmin.Z); } - noise->perlinMap2D(nmin.X, nmin.Z); - noise_stratum_thickness->perlinMap2D(nmin.X, nmin.Z); size_t index = 0; @@ -452,10 +454,18 @@ void OreStratum::generate(MMVManip *vm, int mapseed, u32 blockseed, continue; } - float nmid = noise->result[index]; - float nhalfthick = noise_stratum_thickness->result[index] / 2.0f; - int y0 = MYMAX(nmin.Y, nmid - nhalfthick); - int y1 = MYMIN(nmax.Y, nmid + nhalfthick); + int y0; + int y1; + + if (flags & OREFLAG_USE_NOISE) { + float nmid = noise->result[index]; + float nhalfthick = noise_stratum_thickness->result[index] / 2.0f; + y0 = MYMAX(nmin.Y, nmid - nhalfthick); + y1 = MYMIN(nmax.Y, nmid + nhalfthick); + } else { + y0 = nmin.Y; + y1 = nmax.Y; + } for (int y = y0; y <= y1; y++) { if (pr.range(1, clust_scarcity) != 1) |