diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:02 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-08-22 12:53:02 +0300 |
commit | 23717510c21c89f39760faf033844d531fc093b5 (patch) | |
tree | 078e94632a2d622f0d45673d43e867b717496429 /src/map.cpp | |
parent | 29c9d3d5f44ea6bb812a7d66d3ce582a1aeb7557 (diff) | |
parent | dc4ac0b96fc11d4620f04d6068e681ab793a5d92 (diff) | |
download | minetest-23717510c21c89f39760faf033844d531fc093b5.tar.gz minetest-23717510c21c89f39760faf033844d531fc093b5.tar.bz2 minetest-23717510c21c89f39760faf033844d531fc093b5.zip |
Merge branch 'lava'
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 11 |
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; } |