Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve finite liquid distribution, fix small bug

master
proller 2013-07-04 22:30:25 +04:00
parent a013f762c4
commit 92833a07d1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map.cpp
View File

@ -1653,6 +1653,8 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)
u16 loop_max = g_settings->getU16("liquid_loop_max"); u16 loop_max = g_settings->getU16("liquid_loop_max");
//if (m_transforming_liquid.size() > 0) errorstream << "Liquid queue size="<<m_transforming_liquid.size()<<std::endl;
while (m_transforming_liquid.size() > 0) while (m_transforming_liquid.size() > 0)
{ {
// This should be done here so that it is done when continue is used // This should be done here so that it is done when continue is used
@ -1771,7 +1773,7 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)
} }
// prevent lakes in air above unloaded blocks // prevent lakes in air above unloaded blocks
if (liquid_levels[D_TOP] == 0 && (p0.Y > water_level || !fast_flood) && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE) { if (liquid_levels[D_TOP] == 0 && (p0.Y > water_level) && neighbors[D_BOTTOM].n.getContent() == CONTENT_IGNORE && !(loopcount % 3)) {
--total_level; --total_level;
} }
@ -1794,11 +1796,16 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)
if (!neighbors[ii].l) if (!neighbors[ii].l)
continue; continue;
liquid_levels_want[ii] = want_level; liquid_levels_want[ii] = want_level;
if (liquid_levels_want[ii] < LIQUID_LEVEL_SOURCE && total_level > 0 if (liquid_levels_want[ii] < LIQUID_LEVEL_SOURCE && total_level > 0) {
&& liquid_levels[ii] > liquid_levels_want[ii] if (loopcount % 3 || liquid_levels[ii] <= 0){
) { if (liquid_levels[ii] > liquid_levels_want[ii]) {
++liquid_levels_want[ii]; ++liquid_levels_want[ii];
--total_level; --total_level;
}
} else if (neighbors[ii].l > 0){
++liquid_levels_want[ii];
--total_level;
}
} }
} }