aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-08-15 18:49:44 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-08-15 18:49:44 +0300
commitdc4ac0b96fc11d4620f04d6068e681ab793a5d92 (patch)
treefefe7161e3c3f24ef0c8ad1dce2f83ea0771a2f1 /src
parent296748d32e0bc31c1517faf1de59ba734a4909a4 (diff)
downloadminetest-dc4ac0b96fc11d4620f04d6068e681ab793a5d92.tar.gz
minetest-dc4ac0b96fc11d4620f04d6068e681ab793a5d92.tar.bz2
minetest-dc4ac0b96fc11d4620f04d6068e681ab793a5d92.zip
small fix to transformLiquids
Diffstat (limited to 'src')
-rw-r--r--src/map.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map.cpp b/src/map.cpp
index dc4459263..9d67c8282 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1564,6 +1564,11 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
while(m_transforming_liquid.size() != 0)
{
+ // This should be done here so that it is done when continue is used
+ if(loopcount >= initial_size * 3)
+ break;
+ loopcount++;
+
/*
Get a queued transforming liquid node
*/
@@ -1779,12 +1784,6 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
}
break;
}
-
- loopcount++;
- //if(loopcount >= 100000)
- if(loopcount >= initial_size * 10) {
- break;
- }
}
//dstream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
}