From 78c2b85b1db31cf04548e3d0afc45ccbcb03adb7 Mon Sep 17 00:00:00 2001 From: mix Date: Fri, 23 May 2025 22:08:09 +0100 Subject: [PATCH] Rename MapAnimation namespace to MapAnimations --- src/openrct2-ui/title/TitleSequencePlayer.cpp | 4 ++-- src/openrct2/Context.cpp | 4 ++-- src/openrct2/GameState.cpp | 2 +- src/openrct2/actions/BannerPlaceAction.cpp | 2 +- .../actions/LargeSceneryPlaceAction.cpp | 2 +- .../actions/ParkEntrancePlaceAction.cpp | 2 +- .../actions/RideEntranceExitPlaceAction.cpp | 2 +- .../actions/SmallSceneryPlaceAction.cpp | 4 ++-- src/openrct2/actions/TrackPlaceAction.cpp | 2 +- src/openrct2/actions/WallPlaceAction.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 4 ++-- src/openrct2/rct1/S4Importer.cpp | 8 ++++---- src/openrct2/rct2/S6Importer.cpp | 6 +++--- src/openrct2/ride/Vehicle.cpp | 10 +++++----- src/openrct2/world/Footpath.cpp | 2 +- src/openrct2/world/Map.cpp | 4 ++-- src/openrct2/world/MapAnimation.cpp | 20 +++++++++---------- src/openrct2/world/MapAnimation.h | 4 ++-- src/openrct2/world/TileInspector.cpp | 2 +- test/tests/PlayTests.cpp | 4 ++-- test/tests/S6ImportExportTests.cpp | 4 ++-- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp index 14d0a225c1..226027641b 100644 --- a/src/openrct2-ui/title/TitleSequencePlayer.cpp +++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp @@ -328,7 +328,7 @@ namespace OpenRCT2::Title parkImporter->Import(gameState); ReportProgress(100); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); } PrepareParkForPlayback(); _initialLoadCommand = false; @@ -384,7 +384,7 @@ namespace OpenRCT2::Title parkImporter->Import(gameState); ReportProgress(100); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); } PrepareParkForPlayback(); _initialLoadCommand = false; diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 4644136cd1..4c0c381ab6 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -820,7 +820,7 @@ namespace OpenRCT2 _objectManager->LoadObjects(result.RequiredObjects, true); SetProgress(90, 100, STR_STRING_M_PERCENT); - MapAnimation::ClearAll(); + MapAnimations::ClearAll(); // TODO: Have a separate GameState and exchange once loaded. auto& gameState = ::getGameState(); parkImporter->Import(gameState); @@ -833,7 +833,7 @@ namespace OpenRCT2 gCurrentLoadedPath = path; gFirstTimeSaving = true; GameFixSaveVars(); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); EntityTweener::Get().Reset(); gScreenAge = 0; gLastAutoSaveUpdate = kAutosavePause; diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index e08c4a4777..2a019d0669 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -321,7 +321,7 @@ namespace OpenRCT2 RideMeasurementsUpdate(); News::UpdateCurrentItem(); - MapAnimation::InvalidateAndUpdateAll(); + MapAnimations::InvalidateAndUpdateAll(); VehicleSoundsUpdate(); PeepUpdateCrowdNoise(); ClimateUpdateSound(); diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index 469a646534..6966c07a79 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); - MapAnimation::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(_loc); res.Cost = bannerEntry->price; return res; diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index 330d15ce01..499cfd8238 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); } - MapAnimation::MarkTileForInvalidation(curTile); + MapAnimations::MarkTileForInvalidation(curTile); MapInvalidateTileFull(curTile); if (tile.index == 0) diff --git a/src/openrct2/actions/ParkEntrancePlaceAction.cpp b/src/openrct2/actions/ParkEntrancePlaceAction.cpp index 97faf61e98..f157a57e2c 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) { - MapAnimation::MarkTileForInvalidation(entranceLoc); + MapAnimations::MarkTileForInvalidation(entranceLoc); } } diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index ae91108ab9..9997a76206 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; - MapAnimation::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(_loc); } FootpathQueueChainReset(); diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 26475df0a3..545e5cb803 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -452,11 +452,11 @@ GameActions::Result SmallSceneryPlaceAction::Execute() const MapInvalidateTileFull(_loc); if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_IS_CLOCK)) { - MapAnimation::MarkTileForUpdate(_loc); + MapAnimations::MarkTileForUpdate(_loc); } else if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ANIMATED)) { - MapAnimation::MarkTileForInvalidation(_loc); + MapAnimations::MarkTileForInvalidation(_loc); } return res; diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index aafb50e90a..2fb548851d 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: - MapAnimation::MarkTileForInvalidation(mapLoc); + MapAnimations::MarkTileForInvalidation(mapLoc); break; case TrackElemType::Brakes: [[fallthrough]]; diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 5c555b3c9e..39c3a6ca2a 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); - MapAnimation::MarkTileForInvalidation(targetLoc); + MapAnimations::MarkTileForInvalidation(targetLoc); MapInvalidateTileZoom1({ _loc, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); res.Cost = wallEntry->price; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 9595d83b56..c3870a61e0 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -2848,13 +2848,13 @@ bool NetworkBase::LoadMap(IStream* stream) auto loadResult = importer->LoadFromStream(stream, false); objManager.LoadObjects(loadResult.RequiredObjects); - MapAnimation::ClearAll(); + MapAnimations::ClearAll(); // TODO: Have a separate GameState and exchange once loaded. auto& gameState = getGameState(); importer->Import(gameState); EntityTweener::Get().Reset(); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); gLastAutoSaveUpdate = kAutosavePause; result = true; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 5a89f49688..3b39bfb774 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1468,14 +1468,14 @@ namespace OpenRCT2::RCT1 switch (mapAnimation.Type) { case kRCT12MapAnimationTypeOnRidePhoto: - MapAnimation::CreateTemporary( + MapAnimations::CreateTemporary( { mapAnimation.x, mapAnimation.y, (mapAnimation.BaseZ / 2) * kCoordsZStep }, - MapAnimation::TemporaryType::onRidePhoto); + MapAnimations::TemporaryType::onRidePhoto); break; case kRCT12MapAnimationTypeLandEdgeDoor: - MapAnimation::CreateTemporary( + MapAnimations::CreateTemporary( { mapAnimation.x, mapAnimation.y, (mapAnimation.BaseZ / 2) * kCoordsZStep }, - MapAnimation::TemporaryType::landEdgeDoor); + MapAnimations::TemporaryType::landEdgeDoor); break; } } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 50b977aa3d..c743d4be05 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1029,9 +1029,9 @@ namespace OpenRCT2::RCT2 switch (mapAnimation.Type) { case kRCT12MapAnimationTypeOnRidePhoto: - MapAnimation::CreateTemporary( + MapAnimations::CreateTemporary( { mapAnimation.x, mapAnimation.y, mapAnimation.BaseZ * kCoordsZStep }, - MapAnimation::TemporaryType::onRidePhoto); + MapAnimations::TemporaryType::onRidePhoto); break; case kRCT12MapAnimationTypeWallDoor: { @@ -1051,7 +1051,7 @@ namespace OpenRCT2::RCT2 } tileElement->AsWall()->SetIsAnimating(true); - MapAnimation::MarkTileForUpdate(coords); + MapAnimations::MarkTileForUpdate(coords); } while (!(tileElement++)->IsLastForTile()); break; } diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 8f1c41152e..71b74cc56b 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -6316,7 +6316,7 @@ static void AnimateSceneryDoor(const CoordsXYZD& doorLocation, const CoordsXYZ& door->SetIsAnimating(true); play_scenery_door_open_sound(trackLocation, door); - MapAnimation::MarkTileForUpdate(doorLocation); + MapAnimations::MarkTileForUpdate(doorLocation); } if (isLastVehicle) @@ -6326,7 +6326,7 @@ static void AnimateSceneryDoor(const CoordsXYZD& doorLocation, const CoordsXYZ& door->SetIsAnimating(true); play_scenery_door_close_sound(trackLocation, door); - MapAnimation::MarkTileForUpdate(doorLocation); + MapAnimations::MarkTileForUpdate(doorLocation); } } @@ -6357,7 +6357,7 @@ static void AnimateLandscapeDoor(const CoordsXYZ& doorLocation, TrackElement& tr else trackElement.SetDoorBState(kLandEdgeDoorFrameOpening); - MapAnimation::CreateTemporary(doorLocation, MapAnimation::TemporaryType::landEdgeDoor); + MapAnimations::CreateTemporary(doorLocation, MapAnimations::TemporaryType::landEdgeDoor); } if (isLastVehicle) @@ -6367,7 +6367,7 @@ static void AnimateLandscapeDoor(const CoordsXYZ& doorLocation, TrackElement& tr else trackElement.SetDoorBState(kLandEdgeDoorFrameClosing); - MapAnimation::CreateTemporary(doorLocation, MapAnimation::TemporaryType::landEdgeDoor); + MapAnimations::CreateTemporary(doorLocation, MapAnimations::TemporaryType::landEdgeDoor); } } @@ -7102,7 +7102,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack( if (trackType == TrackElemType::OnRidePhoto) { tileElement->AsTrack()->SetPhotoTimeout(); - MapAnimation::CreateTemporary(TrackLocation, MapAnimation::TemporaryType::onRidePhoto); + MapAnimations::CreateTemporary(TrackLocation, MapAnimations::TemporaryType::onRidePhoto); } if (trackType == TrackElemType::RotationControlToggle) { diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index e7792bbbbe..c388077f26 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 - MapAnimation::MarkTileForInvalidation(lastPath); + MapAnimations::MarkTileForInvalidation(lastPath); } } } diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index a3cd99601c..7fc738d894 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -472,7 +472,7 @@ void MapInit(const TileCoordsXY& size) gameState.widePathTileLoopPosition = {}; gameState.mapSize = size; MapRemoveOutOfRangeElements(); - MapAnimation::ClearAll(); + MapAnimations::ClearAll(); auto intent = Intent(INTENT_ACTION_MAP); ContextBroadcastIntent(&intent); @@ -2407,5 +2407,5 @@ void ShiftMap(const TileCoordsXY& amount) id = BannerIndex::FromUnderlying(id.ToUnderlying() + 1); } - MapAnimation::ShiftAll(amountToMove); + MapAnimations::ShiftAll(amountToMove); } diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 4aa7af2b1d..c71449bb54 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -46,7 +46,7 @@ constexpr ZoomLevel kMaxZoom{ 1 }; struct TemporaryMapAnimation { CoordsXYZ location{}; - MapAnimation::TemporaryType type{}; + MapAnimations::TemporaryType type{}; bool operator<(const TemporaryMapAnimation& rhs) const { @@ -429,7 +429,7 @@ static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation) { switch (animation.type) { - case MapAnimation::TemporaryType::onRidePhoto: + case MapAnimations::TemporaryType::onRidePhoto: { if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z && tileElement->AsTrack()->GetTrackType() == TrackElemType::OnRidePhoto) @@ -438,7 +438,7 @@ static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation) } break; } - case MapAnimation::TemporaryType::landEdgeDoor: + case MapAnimations::TemporaryType::landEdgeDoor: { if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z) { @@ -545,7 +545,7 @@ static std::optional IsElementAnimated(const TileElementBase& elemen return std::nullopt; } -void MapAnimation::MarkTileForInvalidation(const CoordsXY coords) +void MapAnimations::MarkTileForInvalidation(const CoordsXY coords) { const TileCoordsXY tileCoords(coords); if (!_mapAnimationsUpdate.contains(tileCoords)) @@ -554,19 +554,19 @@ void MapAnimation::MarkTileForInvalidation(const CoordsXY coords) } } -void MapAnimation::MarkTileForUpdate(const CoordsXY coords) +void MapAnimations::MarkTileForUpdate(const CoordsXY coords) { const TileCoordsXY tileCoords(coords); _mapAnimationsInvalidate.erase(tileCoords); _mapAnimationsUpdate.insert(tileCoords); } -void MapAnimation::CreateTemporary(const CoordsXYZ& coords, const TemporaryType type) +void MapAnimations::CreateTemporary(const CoordsXYZ& coords, const TemporaryType type) { _temporaryMapAnimations.insert(TemporaryMapAnimation{ coords, type }); } -void MapAnimation::MarkAllTiles() +void MapAnimations::MarkAllTiles() { TileElementIterator it; TileElementIteratorBegin(&it); @@ -671,7 +671,7 @@ static void UpdateAll(const ViewportList& viewports) } } -void MapAnimation::InvalidateAndUpdateAll() +void MapAnimations::InvalidateAndUpdateAll() { PROFILED_FUNCTION(); @@ -695,14 +695,14 @@ void MapAnimation::InvalidateAndUpdateAll() } } -void MapAnimation::ClearAll() +void MapAnimations::ClearAll() { _mapAnimationsInvalidate.clear(); _mapAnimationsUpdate.clear(); _temporaryMapAnimations.clear(); } -void MapAnimation::ShiftAll(const CoordsXY amount) +void MapAnimations::ShiftAll(const CoordsXY amount) { if (amount.x == 0 && amount.y == 0) return; diff --git a/src/openrct2/world/MapAnimation.h b/src/openrct2/world/MapAnimation.h index 0604acbf6c..cb792546c0 100644 --- a/src/openrct2/world/MapAnimation.h +++ b/src/openrct2/world/MapAnimation.h @@ -11,7 +11,7 @@ #include "Location.hpp" -namespace OpenRCT2::MapAnimation +namespace OpenRCT2::MapAnimations { enum class TemporaryType : uint8_t { @@ -26,4 +26,4 @@ namespace OpenRCT2::MapAnimation void InvalidateAndUpdateAll(); void ClearAll(); void ShiftAll(const CoordsXY amount); -} // namespace OpenRCT2::MapAnimation +} // namespace OpenRCT2::MapAnimations diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 0e9226b63d..8679f384f0 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -349,7 +349,7 @@ namespace OpenRCT2::TileInspector *pastedElement = element; pastedElement->SetLastForTile(lastForTile); - MapAnimation::MarkTileForUpdate(tileLoc.ToCoordsXY()); + MapAnimations::MarkTileForUpdate(tileLoc.ToCoordsXY()); if (IsTileSelected(loc)) { diff --git a/test/tests/PlayTests.cpp b/test/tests/PlayTests.cpp index a8d29504f3..d4bd3e9c99 100644 --- a/test/tests/PlayTests.cpp +++ b/test/tests/PlayTests.cpp @@ -51,7 +51,7 @@ static std::unique_ptr localStartGame(const std::string& parkPath) auto loadResult = importer->LoadSavedGame(parkPath.c_str(), false); context->GetObjectManager().LoadObjects(loadResult.RequiredObjects); - MapAnimation::ClearAll(); + MapAnimations::ClearAll(); // TODO: Have a separate GameState and exchange once loaded. auto& gameState = getGameState(); importer->Import(gameState); @@ -61,7 +61,7 @@ static std::unique_ptr localStartGame(const std::string& parkPath) ResetAllSpriteQuadrantPlacements(); LoadPalette(); EntityTweener::Get().Reset(); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); FixInvalidVehicleSpriteSizes(); gGameSpeed = 1; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 0123e46311..5fdefda7fc 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -67,7 +67,7 @@ static void GameInit(bool retainSpatialIndices) ResetAllSpriteQuadrantPlacements(); LoadPalette(); EntityTweener::Get().Reset(); - MapAnimation::MarkAllTiles(); + MapAnimations::MarkAllTiles(); FixInvalidVehicleSpriteSizes(); gGameSpeed = 1; @@ -83,7 +83,7 @@ static bool ImportS6(MemoryStream& stream, std::unique_ptr& context, b auto loadResult = importer->LoadFromStream(&stream, false); objManager.LoadObjects(loadResult.RequiredObjects); - MapAnimation::ClearAll(); + MapAnimations::ClearAll(); // TODO: Have a separate GameState and exchange once loaded. auto& gameState = getGameState(); importer->Import(gameState);