BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Mgv5/mgv7: Sprinkle dust from full_node_max.Y if chunk above is generated

Browse Source 
Mgv5: Add large_cave_depth constant
This commit is contained in:
paramat 2015-03-16 01:22:37 +00:00
parent 2676d289d9
commit d03c2999da
3 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mapgen_v5.cpp
View File

@ -501,7 +501,7 @@ void MapgenV5::generateCaves(int max_stone_y)
index2d = index2d + ystride; index2d = index2d + ystride;
} }
if (node_max.Y > -256) if (node_max.Y > LARGE_CAVE_DEPTH)
return; return;
PseudoRandom ps(blockseed + 21343); PseudoRandom ps(blockseed + 21343);
@ -528,9 +528,28 @@ void MapgenV5::dustTopNodes()
if (biome->c_dust == CONTENT_IGNORE) if (biome->c_dust == CONTENT_IGNORE)
continue; continue;
s16 y = node_max.Y + 1; s16 y_full_max = full_node_max.Y;
u32 vi = vm->m_area.index(x, y, z); u32 vi_full_max = vm->m_area.index(x, y_full_max, z);
for (; y >= node_min.Y; y--) { content_t c_full_max = vm->m_data[vi_full_max].getContent();
s16 y_start;
if (c_full_max == CONTENT_AIR) {
y_start = y_full_max - 1;
} else if (c_full_max == CONTENT_IGNORE) {
s16 y_max = node_max.Y;
u32 vi_max = vm->m_area.index(x, y_max, z);
content_t c_max = vm->m_data[vi_max].getContent();
if (c_max == CONTENT_AIR)
y_start = y_max - 1;
else
continue;
} else {
continue;
}
u32 vi = vm->m_area.index(x, y_start, z);
for (s16 y = y_start; y >= node_min.Y - 1; y--) {
if (vm->m_data[vi].getContent() != CONTENT_AIR) if (vm->m_data[vi].getContent() != CONTENT_AIR)
break; break;
@ -538,11 +557,7 @@ void MapgenV5::dustTopNodes()
} }
content_t c = vm->m_data[vi].getContent(); content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
&& c != biome->c_dust) {
if (y == node_max.Y + 1)
continue;
vm->m_area.add_y(em, vi, 1); vm->m_area.add_y(em, vi, 1);
vm->m_data[vi] = MapNode(biome->c_dust); vm->m_data[vi] = MapNode(biome->c_dust);
} }

2
src/mapgen_v5.h
View File

@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h" #include "mapgen.h"
#define LARGE_CAVE_DEPTH -256
/////////////////// Mapgen V5 flags /////////////////// Mapgen V5 flags
//#define MGV5_ 0x01 //#define MGV5_ 0x01

30
src/mapgen_v7.cpp
View File

@ -691,9 +691,28 @@ void MapgenV7::dustTopNodes()
if (biome->c_dust == CONTENT_IGNORE) if (biome->c_dust == CONTENT_IGNORE)
continue; continue;
s16 y = node_max.Y; s16 y_full_max = full_node_max.Y;
u32 vi = vm->m_area.index(x, y, z); u32 vi_full_max = vm->m_area.index(x, y_full_max, z);
for (; y >= node_min.Y; y--) { content_t c_full_max = vm->m_data[vi_full_max].getContent();
s16 y_start;
if (c_full_max == CONTENT_AIR) {
y_start = y_full_max - 1;
} else if (c_full_max == CONTENT_IGNORE) {
s16 y_max = node_max.Y;
u32 vi_max = vm->m_area.index(x, y_max, z);
content_t c_max = vm->m_data[vi_max].getContent();
if (c_max == CONTENT_AIR)
y_start = y_max - 1;
else
continue;
} else {
continue;
}
u32 vi = vm->m_area.index(x, y_start, z);
for (s16 y = y_start; y >= node_min.Y - 1; y--) {
if (vm->m_data[vi].getContent() != CONTENT_AIR) if (vm->m_data[vi].getContent() != CONTENT_AIR)
break; break;
@ -701,10 +720,7 @@ void MapgenV7::dustTopNodes()
} }
content_t c = vm->m_data[vi].getContent(); content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE) { if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
if (y == node_max.Y)
continue;
vm->m_area.add_y(em, vi, 1); vm->m_area.add_y(em, vi, 1);
vm->m_data[vi] = MapNode(biome->c_dust); vm->m_data[vi] = MapNode(biome->c_dust);
} }