From f18b4872ea7e46b50c9ea0e5e6484baae41b0a44 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Mon, 17 Jun 2013 21:59:42 -0400
Subject: [PATCH] Decoration: Place decorations in mgv6, check if air or
cignore before placement
---
src/mapgen.cpp | 11 ++++++++---
src/mapgen_v6.cpp | 6 ++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index d2bde0063..72757f4fa 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -421,17 +421,22 @@ void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, s16 start_y,
}
size_t ndecos = c_decolist.size();
- content_t c = ndecos ? c_decolist[pr->range(0, ndecos - 1)] : c_deco;
+ content_t c_place = ndecos ? c_decolist[pr->range(0, ndecos - 1)] : c_deco;
s16 height = (deco_height_max > 0) ?
pr->range(deco_height, deco_height_max) : deco_height;
height = MYMIN(height, max_y - p.Y);
-
+
v3s16 em = vm->m_area.getExtent();
for (int i = start_y; i < height; i++) {
vm->m_area.add_y(em, vi, 1);
- vm->m_data[vi] = MapNode(c);
+
+ content_t c = vm->m_data[vi].getContent();
+ if (c != CONTENT_AIR && c != CONTENT_IGNORE)
+ break;
+
+ vm->m_data[vi] = MapNode(c_place);
}
}
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index a411f966b..d3db00dc2 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -445,6 +445,12 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
// Generate some trees, and add grass, if a jungle
if (flags & MG_TREES)
placeTreesAndJungleGrass();
+
+ // Generate the registered decorations
+ for (unsigned int i = 0; i != emerge->decorations.size(); i++) {
+ Decoration *deco = emerge->decorations[i];
+ deco->placeDeco(this, blockseed + i, node_min, node_max);
+ }
// Generate the registered ores
for (unsigned int i = 0; i != emerge->ores.size(); i++) {
--
GitLab