diff options
| author | unknown <gregory.currie@gmail.com> | 2015-01-13 23:28:21 +1100 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-15 21:08:35 +1000 |
| commit | bd0d7865909d2c7f3f2b0b1ba4900d763642af35 (patch) | |
| tree | efd55c0d20d51a2a4f5cbacee6e743369eef3c6a /src/map.cpp | |
| parent | 227e4807b4d6e2f7d59bbe662df9122128952739 (diff) | |
| download | minetest-bd0d7865909d2c7f3f2b0b1ba4900d763642af35.tar.gz minetest-bd0d7865909d2c7f3f2b0b1ba4900d763642af35.tar.bz2 minetest-bd0d7865909d2c7f3f2b0b1ba4900d763642af35.zip | |
Change UniqueQueue to use a queue and a set.
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/map.cpp b/src/map.cpp index ec2a5f74c..48585a170 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1663,7 +1663,8 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks) /* Get a queued transforming liquid node */ - v3s16 p0 = m_transforming_liquid.pop_front(); + v3s16 p0 = m_transforming_liquid.front(); + m_transforming_liquid.pop_front(); MapNode n0 = getNodeNoEx(p0); @@ -1909,7 +1910,10 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks) } //infostream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl; while (must_reflow.size() > 0) - m_transforming_liquid.push_back(must_reflow.pop_front()); + { + m_transforming_liquid.push_back(must_reflow.front()); + must_reflow.pop_front(); + } updateLighting(lighting_modified_blocks, modified_blocks); @@ -2380,8 +2384,8 @@ void ServerMap::finishBlockMake(BlockMakeData *data, */ while(data->transforming_liquid.size() > 0) { - v3s16 p = data->transforming_liquid.pop_front(); - m_transforming_liquid.push_back(p); + m_transforming_liquid.push_back(data->transforming_liquid.front()); + data->transforming_liquid.pop_front(); } /* |