From 89f349f6e8b4ac9b11dba4671d1a8a477b659634 Mon Sep 17 00:00:00 2001 From: mix Date: Sun, 25 May 2025 05:06:19 +0100 Subject: [PATCH] Change MapAnimations::MarkTileForInvalidation parameter to TileCoordsXY --- src/openrct2/actions/BannerPlaceAction.cpp | 2 +- src/openrct2/actions/LargeSceneryPlaceAction.cpp | 2 +- src/openrct2/actions/ParkEntrancePlaceAction.cpp | 2 +- src/openrct2/actions/RideEntranceExitPlaceAction.cpp | 2 +- src/openrct2/actions/SmallSceneryPlaceAction.cpp | 2 +- src/openrct2/actions/TrackPlaceAction.cpp | 2 +- src/openrct2/actions/WallPlaceAction.cpp | 2 +- src/openrct2/world/Footpath.cpp | 2 +- src/openrct2/world/MapAnimation.cpp | 9 ++++----- src/openrct2/world/MapAnimation.h | 2 +- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index 6966c07a79..922abaf03c 100644 --- a/src/openrct2/actions/BannerPlaceAction.cpp +++ b/src/openrct2/actions/BannerPlaceAction.cpp @@ -161,7 +161,7 @@ GameActions::Result BannerPlaceAction::Execute() const bannerElement->SetGhost(GetFlags() & GAME_COMMAND_FLAG_GHOST); MapInvalidateTileFull(_loc); - MapAnimations::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(_loc)); res.Cost = bannerEntry->price; return res; diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index 499cfd8238..6af4f398d3 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -314,7 +314,7 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const newSceneryElement->SetBannerIndex(banner->id); } - MapAnimations::MarkTileForInvalidation(curTile); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(curTile)); MapInvalidateTileFull(curTile); if (tile.index == 0) diff --git a/src/openrct2/actions/ParkEntrancePlaceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp index f157a57e2c..e54392fe10 100644 --- a/src/openrct2/actions/ParkEntrancePlaceAction.cpp +++ b/src/openrct2/actions/ParkEntrancePlaceAction.cpp @@ -186,7 +186,7 @@ GameActions::Result ParkEntrancePlaceAction::Execute() const if (index == 0) { - MapAnimations::MarkTileForInvalidation(entranceLoc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(entranceLoc)); } } diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index 9997a76206..57746df9b7 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -213,7 +213,7 @@ GameActions::Result RideEntranceExitPlaceAction::Execute() const station.LastPeepInQueue = EntityId::GetNull(); station.QueueLength = 0; - MapAnimations::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(_loc)); } FootpathQueueChainReset(); diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 0aef47ffa8..48f6d4b4b7 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -456,7 +456,7 @@ GameActions::Result SmallSceneryPlaceAction::Execute() const } else if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ANIMATED)) { - MapAnimations::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(_loc)); } return res; diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 2fb548851d..55d4a5ef3f 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -600,7 +600,7 @@ GameActions::Result TrackPlaceAction::Execute() const case TrackElemType::Whirlpool: [[fallthrough]]; case TrackElemType::SpinningTunnel: - MapAnimations::MarkTileForInvalidation(mapLoc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(mapLoc)); break; case TrackElemType::Brakes: [[fallthrough]]; diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 39c3a6ca2a..089af693ac 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -399,7 +399,7 @@ GameActions::Result WallPlaceAction::Execute() const wallElement->SetGhost(GetFlags() & GAME_COMMAND_FLAG_GHOST); - MapAnimations::MarkTileForInvalidation(targetLoc); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(targetLoc)); MapInvalidateTileZoom1({ _loc, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); res.Cost = wallEntry->price; diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index c388077f26..e3725ec5ed 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -914,7 +914,7 @@ void FootpathChainRideQueue( lastPathElement->AsPath()->SetHasQueueBanner(true); lastPathElement->AsPath()->SetQueueBannerDirection(lastPathDirection); // set the ride sign direction - MapAnimations::MarkTileForInvalidation(lastPath); + MapAnimations::MarkTileForInvalidation(TileCoordsXY(lastPath)); } } } diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index d43490555b..89aae9b3fb 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -592,12 +592,11 @@ static std::optional IsElementAnimated(const TileElementBase& elemen return std::nullopt; } -void MapAnimations::MarkTileForInvalidation(const CoordsXY coords) +void MapAnimations::MarkTileForInvalidation(const TileCoordsXY coords) { - const TileCoordsXY tileCoords(coords); - if (!_mapAnimationsUpdate.contains(tileCoords)) + if (!_mapAnimationsUpdate.contains(coords)) { - _mapAnimationsInvalidate.insert(tileCoords); + _mapAnimationsInvalidate.insert(coords); } } @@ -624,7 +623,7 @@ void MapAnimations::MarkAllTiles() switch (*isAnimated) { case UpdateType::invalidate: - MarkTileForInvalidation(TileCoordsXY(it.x, it.y).ToCoordsXY()); + MarkTileForInvalidation(TileCoordsXY(it.x, it.y)); break; case UpdateType::update: MarkTileForUpdate(TileCoordsXY(it.x, it.y)); diff --git a/src/openrct2/world/MapAnimation.h b/src/openrct2/world/MapAnimation.h index ad429d1726..be59151205 100644 --- a/src/openrct2/world/MapAnimation.h +++ b/src/openrct2/world/MapAnimation.h @@ -19,7 +19,7 @@ namespace OpenRCT2::MapAnimations landEdgeDoor, }; - void MarkTileForInvalidation(const CoordsXY coords); + void MarkTileForInvalidation(const TileCoordsXY coords); void MarkTileForUpdate(const TileCoordsXY coords); void CreateTemporary(const CoordsXYZ& coords, const TemporaryType type); void MarkAllTiles();