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

Cavegen: Respect is_ground_content MapNode setting; fix some code formatting issues

Browse Source
This commit is contained in:
kwolekr 2013-11-29 20:54:04 -05:00
parent d19a69cd0d
commit 747bc40840
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cavegen.cpp
View File

@ -236,6 +236,9 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz) {
continue; continue;
u32 i = vm->m_area.index(p); u32 i = vm->m_area.index(p);
content_t c = vm->m_data[i].getContent();
if (!ndef->get(c).is_ground_content)
continue;
if (large_cave) { if (large_cave) {
int full_ymin = node_min.Y - MAP_BLOCKSIZE; int full_ymin = node_min.Y - MAP_BLOCKSIZE;
@ -250,7 +253,6 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz) {
} }
} else { } else {
// Don't replace air or water or lava or ignore // Don't replace air or water or lava or ignore
content_t c = vm->m_data[i].getContent();
if (c == CONTENT_IGNORE || c == CONTENT_AIR || if (c == CONTENT_IGNORE || c == CONTENT_AIR ||
c == c_water_source || c == c_lava_source) c == c_water_source || c == c_lava_source)
continue; continue;
@ -530,8 +532,8 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
// Don't replace air, water, lava, or ice // Don't replace air, water, lava, or ice
content_t c = vm->m_data[i].getContent(); content_t c = vm->m_data[i].getContent();
if (c == CONTENT_AIR || c == c_water_source || if (!ndef->get(c).is_ground_content || c == CONTENT_AIR ||
c == c_lava_source || c == c_ice) c == c_water_source || c == c_lava_source || c == c_ice)
continue; continue;
if (large_cave) { if (large_cave) {

11
src/mapnode.cpp
View File

@ -383,8 +383,10 @@ u8 MapNode::getLevel(INodeDefManager *nodemgr) const
return getParam2() & LIQUID_LEVEL_MASK; return getParam2() & LIQUID_LEVEL_MASK;
if(f.leveled || f.param_type_2 == CPT2_LEVELED) { if(f.leveled || f.param_type_2 == CPT2_LEVELED) {
u8 level = getParam2() & LEVELED_MASK; u8 level = getParam2() & LEVELED_MASK;
if(level) return level; if(level)
if(f.leveled > LEVELED_MAX) return LEVELED_MAX; return level;
if(f.leveled > LEVELED_MAX)
return LEVELED_MAX;
return f.leveled; //default return f.leveled; //default
} }
return 0; return 0;
@ -398,7 +400,7 @@ u8 MapNode::setLevel(INodeDefManager *nodemgr, s8 level)
return 0; return 0;
} }
const ContentFeatures &f = nodemgr->get(*this); const ContentFeatures &f = nodemgr->get(*this);
if ( f.param_type_2 == CPT2_FLOWINGLIQUID if (f.param_type_2 == CPT2_FLOWINGLIQUID
|| f.liquid_type == LIQUID_FLOWING || f.liquid_type == LIQUID_FLOWING
|| f.liquid_type == LIQUID_SOURCE) { || f.liquid_type == LIQUID_SOURCE) {
if (level >= LIQUID_LEVEL_SOURCE) { if (level >= LIQUID_LEVEL_SOURCE) {
@ -487,8 +489,7 @@ void MapNode::deSerialize(u8 *source, u8 version)
param0 = readU16(source+0); param0 = readU16(source+0);
param1 = readU8(source+2); param1 = readU8(source+2);
param2 = readU8(source+3); param2 = readU8(source+3);
} }else{
else{
param0 = readU8(source+0); param0 = readU8(source+0);
param1 = readU8(source+1); param1 = readU8(source+1);
param2 = readU8(source+2); param2 = readU8(source+2);

35
src/nodedef.cpp
View File

@ -396,15 +396,16 @@ public:
// Set CONTENT_AIR // Set CONTENT_AIR
{ {
ContentFeatures f; ContentFeatures f;
f.name = "air"; f.name = "air";
f.drawtype = NDT_AIRLIKE; f.drawtype = NDT_AIRLIKE;
f.param_type = CPT_LIGHT; f.param_type = CPT_LIGHT;
f.light_propagates = true; f.light_propagates = true;
f.sunlight_propagates = true; f.sunlight_propagates = true;
f.walkable = false; f.walkable = false;
f.pointable = false; f.pointable = false;
f.diggable = false; f.diggable = false;
f.buildable_to = true; f.buildable_to = true;
f.is_ground_content = true;
// Insert directly into containers // Insert directly into containers
content_t c = CONTENT_AIR; content_t c = CONTENT_AIR;
m_content_features[c] = f; m_content_features[c] = f;
@ -414,16 +415,16 @@ public:
// Set CONTENT_IGNORE // Set CONTENT_IGNORE
{ {
ContentFeatures f; ContentFeatures f;
f.name = "ignore"; f.name = "ignore";
f.drawtype = NDT_AIRLIKE; f.drawtype = NDT_AIRLIKE;
f.param_type = CPT_NONE; f.param_type = CPT_NONE;
f.light_propagates = false; f.light_propagates = false;
f.sunlight_propagates = false; f.sunlight_propagates = false;
f.walkable = false; f.walkable = false;
f.pointable = false; f.pointable = false;
f.diggable = false; f.diggable = false;
// A way to remove accidental CONTENT_IGNOREs f.buildable_to = true; // A way to remove accidental CONTENT_IGNOREs
f.buildable_to = true; f.is_ground_content = true;
// Insert directly into containers // Insert directly into containers
content_t c = CONTENT_IGNORE; content_t c = CONTENT_IGNORE;
m_content_features[c] = f; m_content_features[c] = f;