summaryrefslogtreecommitdiff
path: root/src/content_mapblock.cpp
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2013-02-25 20:52:24 -0800
committerkwolekr <mirrorisim@gmail.com>2013-02-25 20:52:24 -0800
commit979ca23f1eae1adeb8b0083dffe7203c54d87395 (patch)
tree689ce00fbfe55861f4df39e1801fc9bc990b141f /src/content_mapblock.cpp
parent9b5f182642416add39aab7782b1d155dafead160 (diff)
parentb90e431fc785961e7913023999d1f570ad7ca151 (diff)
downloadminetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.tar.gz
minetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.tar.bz2
minetest-979ca23f1eae1adeb8b0083dffe7203c54d87395.zip
Merge pull request #482 from proller/liquid
finite liquid
Diffstat (limited to 'src/content_mapblock.cpp')
-rw-r--r--src/content_mapblock.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 4a5c001d5..0d80dc173 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -261,7 +261,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
level = (-0.5+node_liquid_level) * BS;
else if(n2.getContent() == c_flowing)
level = (-0.5 + ((float)(n2.param2&LIQUID_LEVEL_MASK)
- + 0.5) / 8.0 * node_liquid_level) * BS;
+ + 0.5) / (float)LIQUID_LEVEL_SOURCE * node_liquid_level) * BS;
// Check node above neighbor.
// NOTE: This doesn't get executed if neighbor
@@ -324,7 +324,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
}
}
if(air_count >= 2)
- cornerlevel = -0.5*BS;
+ cornerlevel = -0.5*BS+0.1;
else if(valid_count > 0)
cornerlevel /= valid_count;
corner_levels[i] = cornerlevel;