Skip to content
Permalink
Browse files

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

…ated

Mgv5: Add large_cave_depth constant
  • Loading branch information...
paramat committed Mar 16, 2015
1 parent 2676d28 commit d03c2999daafaff5b48948bb97a5854f5fb56484
Showing with 49 additions and 16 deletions.
  1. +24 −9 src/mapgen_v5.cpp
  2. +2 −0 src/mapgen_v5.h
  3. +23 −7 src/mapgen_v7.cpp
@@ -501,7 +501,7 @@ void MapgenV5::generateCaves(int max_stone_y)
index2d = index2d + ystride;
}

if (node_max.Y > -256)
if (node_max.Y > LARGE_CAVE_DEPTH)
return;

PseudoRandom ps(blockseed + 21343);
@@ -528,21 +528,36 @@ void MapgenV5::dustTopNodes()
if (biome->c_dust == CONTENT_IGNORE)
continue;

s16 y = node_max.Y + 1;
u32 vi = vm->m_area.index(x, y, z);
for (; y >= node_min.Y; y--) {
s16 y_full_max = full_node_max.Y;
u32 vi_full_max = vm->m_area.index(x, y_full_max, z);
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)
break;

vm->m_area.add_y(em, vi, -1);
}

content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE
&& c != biome->c_dust) {
if (y == node_max.Y + 1)
continue;

if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
vm->m_area.add_y(em, vi, 1);
vm->m_data[vi] = MapNode(biome->c_dust);
}
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "mapgen.h"

#define LARGE_CAVE_DEPTH -256

/////////////////// Mapgen V5 flags
//#define MGV5_ 0x01

@@ -691,20 +691,36 @@ void MapgenV7::dustTopNodes()
if (biome->c_dust == CONTENT_IGNORE)
continue;

s16 y = node_max.Y;
u32 vi = vm->m_area.index(x, y, z);
for (; y >= node_min.Y; y--) {
s16 y_full_max = full_node_max.Y;
u32 vi_full_max = vm->m_area.index(x, y_full_max, z);
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)
break;

vm->m_area.add_y(em, vi, -1);
}

content_t c = vm->m_data[vi].getContent();
if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE) {
if (y == node_max.Y)
continue;

if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE && c != biome->c_dust) {
vm->m_area.add_y(em, vi, 1);
vm->m_data[vi] = MapNode(biome->c_dust);
}

0 comments on commit d03c299

Please sign in to comment.
You can’t perform that action at this time.