summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorDániel Juhász <juhdanad@gmail.com>2016-10-25 23:04:10 +0200
committerNer'zhul <nerzhul@users.noreply.github.com>2016-10-27 08:04:42 +0200
commitbcb06aeb8559a295ae4df2ca71b80c74338fb9f6 (patch)
treee85ba3fe016e5cd28273cb9f165daa517cc1bcac /src/map.cpp
parentbe39f61359ad63f2c6d4aea14c1dfd8357eee03f (diff)
downloadminetest-bcb06aeb8559a295ae4df2ca71b80c74338fb9f6.tar.gz
minetest-bcb06aeb8559a295ae4df2ca71b80c74338fb9f6.tar.bz2
minetest-bcb06aeb8559a295ae4df2ca71b80c74338fb9f6.zip
Cleanup
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 5a1611c89..d03943a16 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1228,9 +1228,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
// list of nodes that due to viscosity have not reached their max level height
std::deque<v3s16> must_reflow;
- // List of MapBlocks that will require a lighting update (due to lava)
- std::map<v3s16, MapBlock *> lighting_modified_blocks2;
-
std::vector<std::pair<v3s16, MapNode> > changed_nodes;
u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
@@ -1272,7 +1269,11 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
Collect information about current node
*/
s8 liquid_level = -1;
+ // The liquid node which will be placed there if
+ // the liquid flows into this node.
content_t liquid_kind = CONTENT_IGNORE;
+ // The node which will be placed there if liquid
+ // can't flow into this node.
content_t floodable_node = CONTENT_AIR;
const ContentFeatures &cf = nodemgr->get(n0);
LiquidType liquid_type = cf.liquid_type;
@@ -1494,10 +1495,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
MapBlock *block = getBlockNoCreateNoEx(blockpos);
if (block != NULL) {
modified_blocks[blockpos] = block;
- // If new or old node emits light, MapBlock requires lighting update
- /*if (nodemgr->get(n0).light_source != 0 ||
- nodemgr->get(n00).light_source != 0)
- lighting_modified_blocks[block->getPos()] = block;*/
changed_nodes.push_back(std::pair<v3s16, MapNode>(p0, n00));
}
@@ -1527,7 +1524,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
for (std::deque<v3s16>::iterator iter = must_reflow.begin(); iter != must_reflow.end(); ++iter)
m_transforming_liquid.push_back(*iter);
- //updateLighting(lighting_modified_blocks, modified_blocks);
voxalgo::update_lighting_nodes(this, nodemgr, changed_nodes, modified_blocks);