From 79369a886a4d43bad9b9590281e98c4783c55dfb Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Thu, 1 Aug 2024 20:15:56 +0100 Subject: [PATCH] Codechange: Don't mark tiles dirty when deleting from animated tile list. The callers of DeleteAnimatedTile already know if the tile needs refreshing, so it is redundant for DeleteAnimatedTile to do so. Loosely backported from JGRPP. --- src/animated_tile.cpp | 1 - src/industry_cmd.cpp | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/animated_tile.cpp b/src/animated_tile.cpp index 0b5401564c..946c66a985 100644 --- a/src/animated_tile.cpp +++ b/src/animated_tile.cpp @@ -28,7 +28,6 @@ void DeleteAnimatedTile(TileIndex 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.erase(to_remove); - MarkTileDirtyByTile(tile); } } diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 0707ec9c89..0c17a38105 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -603,8 +603,8 @@ static void AnimatePowerPlantSparks(TileIndex tile) DeleteAnimatedTile(tile); } else { SetAnimationFrame(tile, m + 1); - MarkTileDirtyByTile(tile); } + MarkTileDirtyByTile(tile); } static void AnimateToyFactory(TileIndex tile) @@ -649,8 +649,8 @@ static void AnimateOilWell(TileIndex tile, IndustryGfx gfx) } else { SetAnimationFrame(tile, m); SetIndustryGfx(tile, gfx); - MarkTileDirtyByTile(tile); } + MarkTileDirtyByTile(tile); } static void AnimateMineTower(TileIndex tile) @@ -906,6 +906,7 @@ static void TileLoop_Industry(TileIndex tile) SetIndustryCompleted(tile); SetIndustryConstructionStage(tile, 3); DeleteAnimatedTile(tile); + MarkTileDirtyByTile(tile); } break;