small fix to transformLiquids
authorPerttu Ahola <celeron55@gmail.com>
Mon, 15 Aug 2011 15:49:44 +0000 (18:49 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 15 Aug 2011 15:49:44 +0000 (18:49 +0300)
src/map.cpp

index dc4459263ac5750988f14d19230a84656865cac0..9d67c8282f27b5f7f3c281e0bafcb846dc9877a0 100644 (file)
@@ -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;
 }