From: Giuseppe Bilotta Date: Tue, 16 Aug 2011 14:46:55 +0000 (+0200) Subject: Ensure param2 is set correctly in transformLiquids X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=7024b4519746f267144482a47136a32f9a697546;p=zefram%2Fminetest%2Fminetest_engine.git Ensure param2 is set correctly in transformLiquids --- diff --git a/src/map.cpp b/src/map.cpp index 94cf2e86..6092538f 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1731,14 +1731,14 @@ void Map::transformLiquids(core::map & modified_blocks) update the current node */ bool flow_down_enabled = (flowing_down && ((n0.param2 & LIQUID_FLOW_DOWN_MASK) != LIQUID_FLOW_DOWN_MASK)); - n0.setContent(new_node_content); - if (content_features(n0.getContent()).liquid_type == LIQUID_FLOWING) { + if (content_features(new_node_content).liquid_type == LIQUID_FLOWING) { // set level to last 3 bits, flowing down bit to 4th bit - n0.param2 |= (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK); + n0.param2 = (flowing_down ? LIQUID_FLOW_DOWN_MASK : 0x00) | (new_node_level & LIQUID_LEVEL_MASK); } else { // set the liquid level and flow bit to 0 - n0.param2 &= ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK); + n0.param2 = ~(LIQUID_LEVEL_MASK | LIQUID_FLOW_DOWN_MASK); } + n0.setContent(new_node_content); setNode(p0, n0); v3s16 blockpos = getNodeBlockPos(p0); MapBlock *block = getBlockNoCreateNoEx(blockpos);