mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-20 14:23:08 +01:00
Code Issues Releases Wiki Activity

Make TrackDesignTrackElementFlag adhere to new coding style

Browse Source
This commit is contained in:
Gymnasiast
2024-07-02 16:35:45 +02:00
parent 2372ae39bd
commit fe76427bf3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/rct12/RCT12.cpp
View File

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

8
src/openrct2/ride/TrackDesign.cpp
View File

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

6
src/openrct2/ride/TrackDesign.h
View File

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