mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity

Rename VehicleTrackDirectionMask and VehicleTrackTypeMask

Browse Source
This commit is contained in:
Gymnasiast
2025-12-12 13:20:36 +01:00
parent d77057c2d5
commit 1e3471b5d9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/Vehicle.h
View File

@@ -51,8 +51,8 @@ struct VehicleInfo
struct SoundIdVolume;
constexpr uint16_t VehicleTrackDirectionMask = 0b0000000000000011;
constexpr uint16_t VehicleTrackTypeMask = 0b1111111111111100;
static constexpr uint16_t kVehicleTrackDirectionMask = 0b0000000000000011;
static constexpr uint16_t kVehicleTrackTypeMask = 0b1111111111111100;
enum class MiniGolfAnimation : uint8_t;
@@ -253,19 +253,19 @@ struct Vehicle : EntityBase
bool IsOnCoveredTrack() const;
uint8_t GetTrackDirection() const
{
return TrackTypeAndDirection & VehicleTrackDirectionMask;
return TrackTypeAndDirection & kVehicleTrackDirectionMask;
}
void SetTrackType(OpenRCT2::TrackElemType trackType)
{
// set the upper 14 bits to 0, then set track type
TrackTypeAndDirection &= ~VehicleTrackTypeMask;
TrackTypeAndDirection &= ~kVehicleTrackTypeMask;
TrackTypeAndDirection |= EnumValue(trackType) << 2;
}
void SetTrackDirection(uint8_t trackDirection)
{
// set the lower 2 bits only
TrackTypeAndDirection &= ~VehicleTrackDirectionMask;
TrackTypeAndDirection |= trackDirection & VehicleTrackDirectionMask;
TrackTypeAndDirection &= ~kVehicleTrackDirectionMask;
TrackTypeAndDirection |= trackDirection & kVehicleTrackDirectionMask;
}
bool HasFlag(uint32_t flag) const
{