Skip to content
Permalink
Browse files

Decoration: Place decorations in mgv6, check if air or cignore before…

… placement
  • Loading branch information
kwolekr committed Jun 18, 2013
1 parent 261f559 commit f18b4872ea7e46b50c9ea0e5e6484baae41b0a44
Showing with 14 additions and 3 deletions.
  1. +8 −3 src/mapgen.cpp
  2. +6 −0 src/mapgen_v6.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);
}
}

@@ -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++) {

0 comments on commit f18b487

Please sign in to comment.