From fe76427bf312ecd4b2f4f80abec7d4f00acffd68 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 2 Jul 2024 16:35:45 +0200 Subject: [PATCH] Make TrackDesignTrackElementFlag adhere to new coding style --- src/openrct2/rct12/RCT12.cpp | 8 ++++---- src/openrct2/ride/TrackDesign.cpp | 8 ++++---- src/openrct2/ride/TrackDesign.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index c50c69db10..f69709eee7 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -903,9 +903,9 @@ void ConvertFromTD46Flags(TrackDesignTrackElement& target, uint8_t flags) target.ColourScheme = (flags & EnumValue(TD46Flags::ColourScheme)) >> 4; if (flags & EnumValue(TD46Flags::IsInverted)) - target.SetFlag(TrackDesignTrackElementFlag::IsInverted); + target.SetFlag(TrackDesignTrackElementFlag::isInverted); if (flags & EnumValue(TD46Flags::HasChain)) - target.SetFlag(TrackDesignTrackElementFlag::HasChain); + target.SetFlag(TrackDesignTrackElementFlag::hasChain); } uint8_t ConvertToTD46Flags(const TrackDesignTrackElement& source) @@ -926,9 +926,9 @@ uint8_t ConvertToTD46Flags(const TrackDesignTrackElement& source) trackFlags |= source.ColourScheme << 4; - if (source.HasFlag(TrackDesignTrackElementFlag::HasChain)) + if (source.HasFlag(TrackDesignTrackElementFlag::hasChain)) trackFlags |= EnumValue(TD46Flags::HasChain); - if (source.HasFlag(TrackDesignTrackElementFlag::IsInverted)) + if (source.HasFlag(TrackDesignTrackElementFlag::isInverted)) trackFlags |= EnumValue(TD46Flags::IsInverted); return trackFlags; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 759363fd28..2e7466f369 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -247,11 +247,11 @@ ResultWithMessage TrackDesign::CreateTrackDesignTrack(TrackDesignState& tds, con } if (element->HasChain()) - track.SetFlag(TrackDesignTrackElementFlag::HasChain); + track.SetFlag(TrackDesignTrackElementFlag::hasChain); if (ride.GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_ALTERNATIVE_TRACK_TYPE) && element->IsInverted()) { - track.SetFlag(TrackDesignTrackElementFlag::IsInverted); + track.SetFlag(TrackDesignTrackElementFlag::isInverted); } trackElements.push_back(track); @@ -1611,11 +1611,11 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi int16_t tempZ = newCoords.z - trackCoordinates->z_begin; int32_t liftHillAndAlternativeState = 0; - if (track.HasFlag(TrackDesignTrackElementFlag::HasChain)) + if (track.HasFlag(TrackDesignTrackElementFlag::hasChain)) { liftHillAndAlternativeState |= 1; } - if (track.HasFlag(TrackDesignTrackElementFlag::IsInverted)) + if (track.HasFlag(TrackDesignTrackElementFlag::isInverted)) { liftHillAndAlternativeState |= 2; } diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index 10055d9ae5..be01d099a4 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -90,9 +90,9 @@ struct TrackDesignSceneryElement enum class TrackDesignTrackElementFlag : uint8_t { - HasChain = (1 << 0), - IsInverted = (1 << 1), - IsCovered = (1 << 2), // Reserved + hasChain = (1 << 0), + isInverted = (1 << 1), + isCovered = (1 << 2), // Reserved }; struct TrackDesignTrackElement