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

master #3

Merged
BRNSystems merged 36 commits from Mirrorlandia_minetest/minetest:master into master 2023-12-09 21:39:18 +01:00
Conversation 0 Commits 36 Files Changed 96 +33 -20
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ec3325381 - Show all commits

53
src/map.cpp
View File

@ -512,6 +512,31 @@ struct NodeNeighbor {
{ } { }
}; };
static s8 get_max_liquid_level(NodeNeighbor nb, s8 current_max_node_level)
{
s8 max_node_level = current_max_node_level;
u8 nb_liquid_level = (nb.n.param2 & LIQUID_LEVEL_MASK);
switch (nb.t) {
case NEIGHBOR_UPPER:
if (nb_liquid_level + WATER_DROP_BOOST > current_max_node_level) {
max_node_level = LIQUID_LEVEL_MAX;
if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX)
max_node_level = nb_liquid_level + WATER_DROP_BOOST;
} else if (nb_liquid_level > current_max_node_level) {
max_node_level = nb_liquid_level;
}
break;
case NEIGHBOR_LOWER:
break;
case NEIGHBOR_SAME_LEVEL:
if ((nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK &&
nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level)
max_node_level = nb_liquid_level - 1;
break;
}
return max_node_level;
}
void ServerMap::transforming_liquid_add(v3s16 p) { void ServerMap::transforming_liquid_add(v3s16 p) {
m_transforming_liquid.push_back(p); m_transforming_liquid.push_back(p);
} }
@ -654,7 +679,13 @@ void ServerMap::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
(nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK) { (nb.n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK) {
// if this node is not (yet) of a liquid type, choose the first liquid type we encounter // if this node is not (yet) of a liquid type, choose the first liquid type we encounter
// but exclude falling liquids on the same level, they cannot flow here anyway // but exclude falling liquids on the same level, they cannot flow here anyway
if (liquid_kind == CONTENT_AIR)
// used to determine if the neighbor can even flow into this node
s8 max_level_from_neighbor = get_max_liquid_level(nb, -1);
u8 range = m_nodedef->get(cfnb.liquid_alternative_flowing_id).liquid_range;
if (liquid_kind == CONTENT_AIR &&
max_level_from_neighbor >= (LIQUID_LEVEL_MAX + 1 - range))
liquid_kind = cfnb.liquid_alternative_flowing_id; liquid_kind = cfnb.liquid_alternative_flowing_id;
} }
if (cfnb.liquid_alternative_flowing_id != liquid_kind) { if (cfnb.liquid_alternative_flowing_id != liquid_kind) {
@ -699,25 +730,7 @@ void ServerMap::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
} else { } else {
// no surrounding sources, so get the maximum level that can flow into this node // no surrounding sources, so get the maximum level that can flow into this node
for (u16 i = 0; i < num_flows; i++) { for (u16 i = 0; i < num_flows; i++) {
u8 nb_liquid_level = (flows[i].n.param2 & LIQUID_LEVEL_MASK); max_node_level = get_max_liquid_level(flows[i], max_node_level);
switch (flows[i].t) {
case NEIGHBOR_UPPER:
if (nb_liquid_level + WATER_DROP_BOOST > max_node_level) {
max_node_level = LIQUID_LEVEL_MAX;
if (nb_liquid_level + WATER_DROP_BOOST < LIQUID_LEVEL_MAX)
max_node_level = nb_liquid_level + WATER_DROP_BOOST;
} else if (nb_liquid_level > max_node_level) {
max_node_level = nb_liquid_level;
}
break;
case NEIGHBOR_LOWER:
break;
case NEIGHBOR_SAME_LEVEL:
if ((flows[i].n.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK &&
nb_liquid_level > 0 && nb_liquid_level - 1 > max_node_level)
max_node_level = nb_liquid_level - 1;
break;
}
} }
u8 viscosity = m_nodedef->get(liquid_kind).liquid_viscosity; u8 viscosity = m_nodedef->get(liquid_kind).liquid_viscosity;