mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Make clang-format happy

Browse Source
This commit is contained in:
ζeh Matt
2022-02-13 00:54:39 +02:00
parent d7f5003943
commit ff1eb583fc
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/GameStateSnapshots.cpp
View File

@@ -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;
}

3
src/openrct2/entity/Peep.cpp
View File

@@ -486,7 +486,8 @@ std::optional<CoordsXY> 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,

4
src/openrct2/ride/Ride.cpp
View File

@@ -807,9 +807,7 @@ void Ride::FormatStatusTo(Formatter& ft) const
{
ft.Add<rct_string_id>(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<Guest>(race_winner);
if (peep != nullptr)

3
src/openrct2/ride/Vehicle.cpp
View File

@@ -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<false>(
{ wallCoords, static_cast<Direction>(direction) }, TrackLocation, next_vehicle_on_train.IsNull());
AnimateSceneryDoor<false>({ wallCoords, static_cast<Direction>(direction) }, TrackLocation, next_vehicle_on_train.IsNull());
}
template<bool isBackwards> static void AnimateLandscapeDoor(TrackElement* trackElement, bool isLastVehicle)