dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Replaced SmallVector::ErasePreservingOrder(it, count) with std::vector::erase()

Browse Source
This commit is contained in:
Henry Wilson
2018-09-24 20:18:16 +01:00
committed by PeterN
parent 8460952240
commit 9b5cc73f3e
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/animated_tile.cpp
View File

@@ -27,10 +27,10 @@ SmallVector<TileIndex, 256> _animated_tiles;
*/
void DeleteAnimatedTile(TileIndex tile)
{
TileIndex *to_remove = &*std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
if (to_remove != _animated_tiles.End()) {
auto to_remove = std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
if (to_remove != _animated_tiles.end()) {
/* The order of the remaining elements must stay the same, otherwise the animation loop may miss a tile. */
_animated_tiles.ErasePreservingOrder(to_remove);
_animated_tiles.erase(to_remove);
MarkTileDirtyByTile(tile);
}
}