diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-11-29 20:54:04 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-11-29 20:54:04 -0500 |
| commit | 747bc40840ff13bcf9c7a60b790a6de24f94f946 (patch) | |
| tree | deb362d95bd040357a76ca71c493c1a44acb3444 /src/mapnode.cpp | |
| parent | d19a69cd0d22dfbe802286baf8b33ebb8c6f4fa2 (diff) | |
| download | minetest-747bc40840ff13bcf9c7a60b790a6de24f94f946.tar.gz minetest-747bc40840ff13bcf9c7a60b790a6de24f94f946.tar.bz2 minetest-747bc40840ff13bcf9c7a60b790a6de24f94f946.zip | |
Cavegen: Respect is_ground_content MapNode setting; fix some code formatting issues
Diffstat (limited to 'src/mapnode.cpp')
| -rw-r--r-- | src/mapnode.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mapnode.cpp b/src/mapnode.cpp index a47a48bc0..d52677be0 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -383,8 +383,10 @@ u8 MapNode::getLevel(INodeDefManager *nodemgr) const return getParam2() & LIQUID_LEVEL_MASK; if(f.leveled || f.param_type_2 == CPT2_LEVELED) { u8 level = getParam2() & LEVELED_MASK; - if(level) return level; - if(f.leveled > LEVELED_MAX) return LEVELED_MAX; + if(level) + return level; + if(f.leveled > LEVELED_MAX) + return LEVELED_MAX; return f.leveled; //default } return 0; @@ -398,7 +400,7 @@ u8 MapNode::setLevel(INodeDefManager *nodemgr, s8 level) return 0; } 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_SOURCE) { if (level >= LIQUID_LEVEL_SOURCE) { @@ -487,8 +489,7 @@ void MapNode::deSerialize(u8 *source, u8 version) param0 = readU16(source+0); param1 = readU8(source+2); param2 = readU8(source+3); - } - else{ + }else{ param0 = readU8(source+0); param1 = readU8(source+1); param2 = readU8(source+2); |