Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-23 22:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kwolekr 2013-06-17 21:59:42 -04:00
parent 261f559339
commit f18b4872ea
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mapgen.cpp
View File

@ -421,17 +421,22 @@ void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, s16 start_y,
} }
size_t ndecos = c_decolist.size(); 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) ? s16 height = (deco_height_max > 0) ?
pr->range(deco_height, deco_height_max) : deco_height; pr->range(deco_height, deco_height_max) : deco_height;
height = MYMIN(height, max_y - p.Y); height = MYMIN(height, max_y - p.Y);
v3s16 em = vm->m_area.getExtent(); v3s16 em = vm->m_area.getExtent();
for (int i = start_y; i < height; i++) { for (int i = start_y; i < height; i++) {
vm->m_area.add_y(em, vi, 1); 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);
} }
} }

6
src/mapgen_v6.cpp
View File

@ -445,6 +445,12 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
// Generate some trees, and add grass, if a jungle // Generate some trees, and add grass, if a jungle
if (flags & MG_TREES) if (flags & MG_TREES)
placeTreesAndJungleGrass(); 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 // Generate the registered ores
for (unsigned int i = 0; i != emerge->ores.size(); i++) { for (unsigned int i = 0; i != emerge->ores.size(); i++) {