From ff1eb583fc1ea6b0bc65d62df9e93d46760cea50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Sun, 13 Feb 2022 00:54:39 +0200 Subject: [PATCH] Make clang-format happy --- src/openrct2/GameStateSnapshots.cpp | 3 ++- src/openrct2/entity/Peep.cpp | 3 ++- src/openrct2/ride/Ride.cpp | 4 +--- src/openrct2/ride/Vehicle.cpp | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp index 1cd7e1cae8..76097c32b6 100644 --- a/src/openrct2/GameStateSnapshots.cpp +++ b/src/openrct2/GameStateSnapshots.cpp @@ -218,7 +218,8 @@ struct GameStateSnapshots final : public IGameStateSnapshots sprite.base.Type = EntityType::Null; } - snapshot.SerialiseSprites([&spriteList](const EntityId index) { return &spriteList[index.ToUnderlying()]; }, MAX_ENTITIES, false); + snapshot.SerialiseSprites( + [&spriteList](const EntityId index) { return &spriteList[index.ToUnderlying()]; }, MAX_ENTITIES, false); return spriteList; } diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 6293f923b5..d9dedaff86 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -486,7 +486,8 @@ std::optional Peep::UpdateAction(int16_t& xy_distance) WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2; const auto curLoc = GetLocation(); - Litter::Create({ curLoc, sprite_direction }, (sprite_index.ToUnderlying() & 1) ? Litter::Type::VomitAlt : Litter::Type::Vomit); + Litter::Create( + { curLoc, sprite_direction }, (sprite_index.ToUnderlying() & 1) ? Litter::Type::VomitAlt : Litter::Type::Vomit); static constexpr OpenRCT2::Audio::SoundId coughs[4] = { OpenRCT2::Audio::SoundId::Cough1, diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index acf89f7218..68aa35082d 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -807,9 +807,7 @@ void Ride::FormatStatusTo(Formatter& ft) const { ft.Add(STR_TEST_RUN); } - else if ( - mode == RideMode::Race && !(lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) - && !race_winner.IsNull()) + else if (mode == RideMode::Race && !(lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING) && !race_winner.IsNull()) { auto peep = GetEntity(race_winner); if (peep != nullptr) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index cac50f6ec9..bb9098aba2 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -7331,8 +7331,7 @@ void Vehicle::UpdateSceneryDoor() const auto wallCoords = CoordsXYZ{ x, y, TrackLocation.z - trackBlock->z + trackCoordinates->z_end }.ToTileStart(); int32_t direction = (GetTrackDirection() + trackCoordinates->rotation_end) & 3; - AnimateSceneryDoor( - { wallCoords, static_cast(direction) }, TrackLocation, next_vehicle_on_train.IsNull()); + AnimateSceneryDoor({ wallCoords, static_cast(direction) }, TrackLocation, next_vehicle_on_train.IsNull()); } template static void AnimateLandscapeDoor(TrackElement* trackElement, bool isLastVehicle)