From 15ee05dfb0bf98194354307e69330a7b697b06c4 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 1 Jul 2024 17:29:08 +0200 Subject: [PATCH] Rename kNumOrthogonalDirections constant --- src/openrct2-ui/ride/Construction.h | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 6 +- src/openrct2/actions/TrackPlaceAction.cpp | 2 +- src/openrct2/entity/Fountain.cpp | 4 +- src/openrct2/entity/Guest.cpp | 2 +- src/openrct2/entity/Staff.cpp | 10 ++-- src/openrct2/paint/VirtualFloor.cpp | 6 +- src/openrct2/paint/support/MetalSupports.cpp | 4 +- src/openrct2/paint/support/WoodenSupports.cpp | 6 +- .../paint/tile_element/Paint.Tunnel.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 10 ++-- src/openrct2/ride/TrackPaint.cpp | 2 +- src/openrct2/ride/TrackPaint.h | 2 +- src/openrct2/ride/VehicleSubpositionData.h | 2 +- src/openrct2/ride/coaster/AlpineCoaster.cpp | 2 +- .../ride/coaster/BobsleighCoaster.cpp | 2 +- .../ride/coaster/BolligerMabillardTrack.hpp | 8 +-- .../coaster/ClassicStandUpRollerCoaster.cpp | 60 +++++++++---------- .../coaster/ClassicWoodenRollerCoaster.cpp | 6 +- .../ride/coaster/CompactInvertedCoaster.cpp | 6 +- .../ride/coaster/CorkscrewRollerCoaster.hpp | 8 +-- .../ride/coaster/FlyingRollerCoaster.cpp | 2 +- src/openrct2/ride/coaster/GigaCoaster.cpp | 6 +- src/openrct2/ride/coaster/HybridCoaster.cpp | 2 +- .../ride/coaster/InvertedRollerCoaster.cpp | 4 +- .../coaster/LayDownRollerCoasterInverted.cpp | 8 +-- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 2 +- .../ride/coaster/LoopingRollerCoaster.cpp | 4 +- src/openrct2/ride/coaster/MineRide.cpp | 2 +- .../ride/coaster/MineTrainCoaster.cpp | 10 ++-- .../ride/coaster/MiniRollerCoaster.cpp | 4 +- .../ride/coaster/MiniSuspendedCoaster.cpp | 2 +- .../coaster/MultiDimensionRollerCoaster.cpp | 10 ++-- .../coaster/SideFrictionRollerCoaster.cpp | 4 +- .../ride/coaster/SingleRailRollerCoaster.cpp | 2 +- .../ride/coaster/StandUpRollerCoaster.cpp | 8 +-- src/openrct2/ride/coaster/Steeplechase.cpp | 4 +- .../ride/coaster/SuspendedSwingingCoaster.cpp | 2 +- src/openrct2/ride/coaster/WildMouse.cpp | 2 +- .../ride/coaster/WoodenRollerCoaster.cpp | 12 ++-- .../ride/coaster/WoodenRollerCoaster.h | 2 +- src/openrct2/ride/gentle/MiniHelicopters.cpp | 2 +- .../ride/transport/MiniatureRailway.cpp | 10 ++-- src/openrct2/ride/transport/Monorail.cpp | 30 +++++----- .../ride/transport/SuspendedMonorail.cpp | 2 +- src/openrct2/ride/water/SplashBoats.cpp | 8 +-- src/openrct2/world/Footpath.cpp | 12 ++-- src/openrct2/world/Footpath.h | 6 +- src/openrct2/world/Location.hpp | 4 +- src/openrct2/world/Map.cpp | 2 +- src/openrct2/world/Wall.cpp | 2 +- 52 files changed, 162 insertions(+), 162 deletions(-) diff --git a/src/openrct2-ui/ride/Construction.h b/src/openrct2-ui/ride/Construction.h index db19d93dea..f8149a79ef 100644 --- a/src/openrct2-ui/ride/Construction.h +++ b/src/openrct2-ui/ride/Construction.h @@ -143,7 +143,7 @@ static_assert(TrackElemType::Count == 339, "Reminder to add new track element to constexpr bool TrackPieceDirectionIsDiagonal(const uint8_t direction) { - return direction >= NumOrthogonalDirections; + return direction >= kNumOrthogonalDirections; } struct SpecialElement diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index d1473f383e..746ee3e2f2 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -3363,10 +3363,10 @@ static Widget _rideConstructionWidgets[] = { if (_autoRotatingShop && _rideConstructionState == RideConstructionState::Place && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP_OR_FACILITY)) { - PathElement* pathsByDir[NumOrthogonalDirections]; + PathElement* pathsByDir[kNumOrthogonalDirections]; bool keepOrientation = false; - for (int8_t i = 0; i < NumOrthogonalDirections; i++) + for (int8_t i = 0; i < kNumOrthogonalDirections; i++) { const auto testLoc = CoordsXYZ{ *mapCoords + CoordsDirectionDelta[i], z }; if (!MapIsLocationOwned(testLoc)) @@ -3408,7 +3408,7 @@ static Widget _rideConstructionWidgets[] = { if (!keepOrientation) { - for (int8_t i = 0; i < NumOrthogonalDirections; i++) + for (int8_t i = 0; i < kNumOrthogonalDirections; i++) { if (pathsByDir[i] != nullptr) { diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index 049b4a4520..e719fc20f1 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -513,7 +513,7 @@ GameActions::Result TrackPlaceAction::Execute() const uint8_t intersectingDirections = wallEdges[blockIndex]; intersectingDirections ^= 0x0F; intersectingDirections = Numerics::rol4(intersectingDirections, _origin.direction); - for (int32_t i = 0; i < NumOrthogonalDirections; i++) + for (int32_t i = 0; i < kNumOrthogonalDirections; i++) { if (intersectingDirections & (1 << i)) { diff --git a/src/openrct2/entity/Fountain.cpp b/src/openrct2/entity/Fountain.cpp index 5bbb7ca192..4a7d6eeae3 100644 --- a/src/openrct2/entity/Fountain.cpp +++ b/src/openrct2/entity/Fountain.cpp @@ -100,7 +100,7 @@ void JumpingFountain::StartAnimation(const JumpingFountainType newType, const Co { case PATTERN::CYCLIC_SQUARES: // 0, 1, 2, 3 - for (int32_t i = 0; i < NumOrthogonalDirections; i++) + for (int32_t i = 0; i < kNumOrthogonalDirections; i++) { JumpingFountain::Create( newType, { newLoc + _fountainDirectionsPositive[i], newZ }, _fountainDirections[i], @@ -110,7 +110,7 @@ void JumpingFountain::StartAnimation(const JumpingFountainType newType, const Co case PATTERN::BOUNCING_PAIRS: // random [0, 2 or 1, 3] randomIndex = ScenarioRand() & 1; - for (int32_t i = randomIndex; i < NumOrthogonalDirections; i += 2) + for (int32_t i = randomIndex; i < kNumOrthogonalDirections; i += 2) { JumpingFountain::Create( newType, { newLoc + _fountainDirectionsPositive[i], newZ }, _fountainDirections[i], diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 393a43a304..4d7a790383 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -4923,7 +4923,7 @@ void Guest::UpdateRideMazePathfinding() uint8_t hedges[4]{ 0xFF, 0xFF, 0xFF, 0xFF }; uint8_t openCount = 0; uint8_t mazeReverseLastEdge = DirectionReverse(MazeLastEdge); - for (uint8_t i = 0; i < NumOrthogonalDirections; ++i) + for (uint8_t i = 0; i < kNumOrthogonalDirections; ++i) { if (!(mazeEntry & (1 << _MazeCurrentDirectionToOpenHedge[Var37 / 4][i])) && i != mazeReverseLastEdge) { diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 7bd03f103b..843654f770 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -453,10 +453,10 @@ uint8_t Staff::HandymanDirectionToUncutGrass(uint8_t valid_directions) const */ Direction Staff::HandymanDirectionRandSurface(uint8_t validDirections) const { - Direction newDirection = ScenarioRand() % NumOrthogonalDirections; - for (int32_t i = 0; i < NumOrthogonalDirections; ++i, ++newDirection) + Direction newDirection = ScenarioRand() % kNumOrthogonalDirections; + for (int32_t i = 0; i < kNumOrthogonalDirections; ++i, ++newDirection) { - newDirection %= NumOrthogonalDirections; + newDirection %= kNumOrthogonalDirections; if (!(validDirections & (1 << newDirection))) continue; @@ -470,7 +470,7 @@ Direction Staff::HandymanDirectionRandSurface(uint8_t validDirections) const // If it tries all directions this is required // to make it back to the first direction and // override validDirections - newDirection %= NumOrthogonalDirections; + newDirection %= kNumOrthogonalDirections; return newDirection; } @@ -804,7 +804,7 @@ Direction Staff::DirectionPath(uint8_t validDirections, PathElement* pathElement } direction = ScenarioRand() & 3; - for (uint8_t i = 0; i < NumOrthogonalDirections; ++i, direction = DirectionNext(direction)) + for (uint8_t i = 0; i < kNumOrthogonalDirections; ++i, direction = DirectionNext(direction)) { if (pathDirections & (1 << direction)) return direction; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index d8b02bd217..5c118a0efe 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -336,9 +336,9 @@ void VirtualFloorPaint(PaintSession& session) // Try the four tiles next to us for the same parameters as above, // if our parameters differ we set an edge towards that tile - for (uint8_t i = 0; i < NumOrthogonalDirections; i++) + for (uint8_t i = 0; i < kNumOrthogonalDirections; i++) { - uint8_t effectiveRotation = (NumOrthogonalDirections + i - direction) % NumOrthogonalDirections; + uint8_t effectiveRotation = (kNumOrthogonalDirections + i - direction) % kNumOrthogonalDirections; CoordsXY theirLocation = session.MapPosition + scenery_half_tile_offsets[effectiveRotation]; bool theyAreOccupied; @@ -352,7 +352,7 @@ void VirtualFloorPaint(PaintSession& session) theirLocation, virtualFloorClipHeight, &theyAreOccupied, &theyAreOwned, &theirOccupiedEdges, &theyAreBelowGround, &theyAreAboveGround, &theyAreLit); - if (theirOccupiedEdges & (1 << ((effectiveRotation + 2) % NumOrthogonalDirections)) && (weAreOwned && !theyAreOwned)) + if (theirOccupiedEdges & (1 << ((effectiveRotation + 2) % kNumOrthogonalDirections)) && (weAreOwned && !theyAreOwned)) { occupiedEdges |= 1 << i; } diff --git a/src/openrct2/paint/support/MetalSupports.cpp b/src/openrct2/paint/support/MetalSupports.cpp index ccd3d256b7..c181cd161a 100644 --- a/src/openrct2/paint/support/MetalSupports.cpp +++ b/src/openrct2/paint/support/MetalSupports.cpp @@ -194,7 +194,7 @@ static constexpr uint8_t kMetalSupportsSlopeImageOffsetMap[] = { }; // clang-format on -static constexpr MetalSupportPlace kMetalSupportPlacementRotated[][NumOrthogonalDirections] = { +static constexpr MetalSupportPlace kMetalSupportPlacementRotated[][kNumOrthogonalDirections] = { { MetalSupportPlace::TopCorner, MetalSupportPlace::RightCorner, MetalSupportPlace::BottomCorner, MetalSupportPlace::LeftCorner }, { MetalSupportPlace::LeftCorner, MetalSupportPlace::TopCorner, MetalSupportPlace::RightCorner, @@ -215,7 +215,7 @@ static constexpr MetalSupportPlace kMetalSupportPlacementRotated[][NumOrthogonal }; constexpr uint8_t MetalSupportTypeCount = 13; -constexpr MetalSupportType kMetalSupportTypeRotated[MetalSupportTypeCount][NumOrthogonalDirections] = { +constexpr MetalSupportType kMetalSupportTypeRotated[MetalSupportTypeCount][kNumOrthogonalDirections] = { { MetalSupportType::Tubes, MetalSupportType::Tubes, MetalSupportType::Tubes, MetalSupportType::Tubes }, { MetalSupportType::Fork, MetalSupportType::ForkAlt, MetalSupportType::Fork, MetalSupportType::ForkAlt }, { MetalSupportType::ForkAlt, MetalSupportType::Fork, MetalSupportType::ForkAlt, MetalSupportType::Fork }, diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp index d97050188a..e51f34a974 100644 --- a/src/openrct2/paint/support/WoodenSupports.cpp +++ b/src/openrct2/paint/support/WoodenSupports.cpp @@ -55,7 +55,7 @@ constexpr SupportsIdDescriptor GetWoodenSupportIds(WoodenSupportType supportType return WoodenSupportImageIds[EnumValue(supportType)][EnumValue(subType)]; } -using ImagesByTransitionTypeArray = std::array, 21>; +using ImagesByTransitionTypeArray = std::array, 21>; static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds0 = { { { 3465, 3466, 3467, 3468 }, // Flat to gentle @@ -274,7 +274,7 @@ static constexpr uint16_t word_97B3C4[] = { }; // clang-format on -static WoodenSupportSubType rotatedWoodenSupportSubTypes[kNumWoodenSupportSubTypes][NumOrthogonalDirections] = { +static WoodenSupportSubType rotatedWoodenSupportSubTypes[kNumWoodenSupportSubTypes][kNumOrthogonalDirections] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::NwSe, @@ -353,7 +353,7 @@ static bool WoodenABSupportPaintSetupPaintSpecial( PaintSession& session, WoodenSupportType supportType, WoodenSupportSubType subType, WoodenSupportTransitionType transitionType, Direction direction, const ImageId& imageTemplate, uint16_t baseHeight) { - const uint16_t supportsDescriptorIndex = (EnumValue(transitionType) * NumOrthogonalDirections) + direction; + const uint16_t supportsDescriptorIndex = (EnumValue(transitionType) * kNumOrthogonalDirections) + direction; const UnkSupportsDescriptor& supportsDesc = SupportsDescriptors[supportsDescriptorIndex]; const auto* imageIds = WoodenCurveSupportImageIds[EnumValue(supportType)][EnumValue(subType)]; diff --git a/src/openrct2/paint/tile_element/Paint.Tunnel.cpp b/src/openrct2/paint/tile_element/Paint.Tunnel.cpp index a3eb06e3ed..d0c7f3c0cd 100644 --- a/src/openrct2/paint/tile_element/Paint.Tunnel.cpp +++ b/src/openrct2/paint/tile_element/Paint.Tunnel.cpp @@ -162,7 +162,7 @@ void TrackPaintUtilRightQuarterTurn1TileTunnel( int8_t endOffset, TunnelType endTunnel) { TrackPaintUtilLeftQuarterTurn1TileTunnel( - session, (direction + 3) % NumOrthogonalDirections, baseHeight, endOffset, endTunnel, startOffset, startTunnel); + session, (direction + 3) % kNumOrthogonalDirections, baseHeight, endOffset, endTunnel, startOffset, startTunnel); } void TrackPaintUtilLeftQuarterTurn1TileTunnel( diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index ecb5b4e84b..bf6374efbd 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -499,7 +499,7 @@ void RideRemoveProvisionalTrackPiece() if (rtd.HasFlag(RIDE_TYPE_FLAG_IS_MAZE)) { const int32_t flags = GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_NO_SPEND | GAME_COMMAND_FLAG_GHOST; - const CoordsXYZD quadrants[NumOrthogonalDirections] = { + const CoordsXYZD quadrants[kNumOrthogonalDirections] = { { x, y, z, 0 }, { x, y + 16, z, 1 }, { x + 16, y + 16, z, 2 }, diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index ab2638500e..9ea3f0f253 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -509,7 +509,7 @@ ResultWithMessage TrackDesign::CreateTrackDesignScenery(TrackDesignState& tds) { case ObjectType::Paths: { - uint8_t slope = (scenery.getSlopeDirection() - _saveDirection) % NumOrthogonalDirections; + uint8_t slope = (scenery.getSlopeDirection() - _saveDirection) % kNumOrthogonalDirections; scenery.setSlopeDirection(slope); uint8_t edges = Numerics::ror4(scenery.getEdges(), _saveDirection); @@ -518,16 +518,16 @@ ResultWithMessage TrackDesign::CreateTrackDesignScenery(TrackDesignState& tds) } case ObjectType::Walls: { - auto direction = (scenery.getRotation() - _saveDirection) % NumOrthogonalDirections; + auto direction = (scenery.getRotation() - _saveDirection) % kNumOrthogonalDirections; scenery.setRotation(direction); break; } default: { - auto direction = (scenery.getRotation() - _saveDirection) % NumOrthogonalDirections; + auto direction = (scenery.getRotation() - _saveDirection) % kNumOrthogonalDirections; scenery.setRotation(direction); - auto quadrant = (scenery.getQuadrant() - _saveDirection) % NumOrthogonalDirections; + auto quadrant = (scenery.getQuadrant() - _saveDirection) % kNumOrthogonalDirections; scenery.setQuadrant(quadrant); break; @@ -2018,7 +2018,7 @@ void TrackDesignSceneryElement::setHasSlope(bool on) Direction TrackDesignSceneryElement::getSlopeDirection() const { - return (flags >> 5) % NumOrthogonalDirections; + return (flags >> 5) % kNumOrthogonalDirections; } void TrackDesignSceneryElement::setSlopeDirection(Direction slope) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index f8c9e32c9f..afacfe7332 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -1370,7 +1370,7 @@ void TrackPaintUtilRightQuarterTurn5TilesPaint3( void TrackPaintUtilRightQuarterTurn5TilesWoodenSupports( PaintSession& session, int16_t height, Direction direction, uint8_t trackSequence) { - static constexpr WoodenSupportSubType supportTypes[NumOrthogonalDirections][7] = { + static constexpr WoodenSupportSubType supportTypes[kNumOrthogonalDirections][7] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index d42fb8dba8..a1f758f4f2 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -391,7 +391,7 @@ extern const int8_t defaultEighthToDiagThickness[4][4]; extern const CoordsXY defaultDiagBoundLengths[4]; extern const CoordsXY defaultDiagTileOffsets[4]; -constexpr bool kDiagSpriteMap[NumOrthogonalDirections][4] = { +constexpr bool kDiagSpriteMap[kNumOrthogonalDirections][4] = { { false, true, false, false }, { false, false, false, true }, { false, false, true, false }, diff --git a/src/openrct2/ride/VehicleSubpositionData.h b/src/openrct2/ride/VehicleSubpositionData.h index 224799d0cf..f9d6feaa4c 100644 --- a/src/openrct2/ride/VehicleSubpositionData.h +++ b/src/openrct2/ride/VehicleSubpositionData.h @@ -13,7 +13,7 @@ #include -constexpr const size_t VehicleTrackSubpositionSizeDefault = TrackElemType::Count * NumOrthogonalDirections; +constexpr const size_t VehicleTrackSubpositionSizeDefault = TrackElemType::Count * kNumOrthogonalDirections; struct VehicleInfo; diff --git a/src/openrct2/ride/coaster/AlpineCoaster.cpp b/src/openrct2/ride/coaster/AlpineCoaster.cpp index 66a7177977..73ba5cae05 100644 --- a/src/openrct2/ride/coaster/AlpineCoaster.cpp +++ b/src/openrct2/ride/coaster/AlpineCoaster.cpp @@ -1101,7 +1101,7 @@ namespace AlpineRC PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { SPR_G2_ALPINE_TRACK_FLAT_DIAGONAL, SPR_G2_ALPINE_TRACK_FLAT_DIAGONAL + 1, SPR_G2_ALPINE_TRACK_FLAT_DIAGONAL + 2, SPR_G2_ALPINE_TRACK_FLAT_DIAGONAL + 3 }, { SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL, SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 1, diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 230c8ada3d..086900427a 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -28,7 +28,7 @@ static constexpr uint32_t BOBSLEIGH_BLOCK_BRAKE_NW_SE_OPEN = 14587; static constexpr uint32_t BOBSLEIGH_BLOCK_BRAKE_SW_NE_CLOSED = 14588; static constexpr uint32_t BOBSLEIGH_BLOCK_BRAKE_NW_SE_CLOSED = 14589; -static constexpr uint32_t _BobsleighBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _BobsleighBlockBrakeImages[kNumOrthogonalDirections][2] = { { BOBSLEIGH_BLOCK_BRAKE_SW_NE_OPEN, BOBSLEIGH_BLOCK_BRAKE_SW_NE_CLOSED }, { BOBSLEIGH_BLOCK_BRAKE_NW_SE_OPEN, BOBSLEIGH_BLOCK_BRAKE_NW_SE_CLOSED }, { BOBSLEIGH_BLOCK_BRAKE_SW_NE_OPEN, BOBSLEIGH_BLOCK_BRAKE_SW_NE_CLOSED }, diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp index 1fc4a739a2..d6b539b666 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp @@ -28,21 +28,21 @@ static constexpr uint32_t BM_BLOCK_BRAKE_NW_SE_OPEN = 17151; static constexpr uint32_t BM_BLOCK_BRAKE_SW_NE_CLOSED = 17152; static constexpr uint32_t BM_BLOCK_BRAKE_NW_SE_CLOSED = 17153; -static constexpr uint32_t _BolligerMabillardBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _BolligerMabillardBlockBrakeImages[kNumOrthogonalDirections][2] = { { BM_BLOCK_BRAKE_SW_NE_OPEN, BM_BLOCK_BRAKE_SW_NE_CLOSED }, { BM_BLOCK_BRAKE_NW_SE_OPEN, BM_BLOCK_BRAKE_NW_SE_CLOSED }, { BM_BLOCK_BRAKE_SW_NE_OPEN, BM_BLOCK_BRAKE_SW_NE_CLOSED }, { BM_BLOCK_BRAKE_NW_SE_OPEN, BM_BLOCK_BRAKE_NW_SE_CLOSED }, }; -static constexpr const uint32_t BolligerMabillardDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t BolligerMabillardDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_BM_DIAG_BRAKES, SPR_G2_BM_DIAG_BRAKES + 1, SPR_G2_BM_DIAG_BRAKES, SPR_G2_BM_DIAG_BRAKES + 1, }; -static constexpr const uint32_t BolligerMabillardDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t BolligerMabillardDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_BM_DIAG_BRAKES + 3, SPR_G2_BM_DIAG_BRAKES + 5, @@ -5915,7 +5915,7 @@ static void BolligerMabillardTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 17788, 17789, 17790, 17791 }, { 17858, 17859, 17860, 17861 }, }; diff --git a/src/openrct2/ride/coaster/ClassicStandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/ClassicStandUpRollerCoaster.cpp index e90c1c5e30..ab520e5f20 100644 --- a/src/openrct2/ride/coaster/ClassicStandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ClassicStandUpRollerCoaster.cpp @@ -147,7 +147,7 @@ static void classicStandUpRCTrackFlatToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcFlatToLeftBank0, kClassicStandUpRcFlatToLeftBank1, kClassicStandUpRcFlatToLeftBank2, @@ -171,7 +171,7 @@ static void classicStandUpRCTrackFlatToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcFlatToRightBank0, kClassicStandUpRcFlatToRightBank1, kClassicStandUpRcFlatToRightBank2, @@ -196,7 +196,7 @@ static void classicStandUpRCTrackLeftBankToFlat( const TrackElement& trackElement) { return classicStandUpRCTrackFlatToRightBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackRightBankToFlat( @@ -204,7 +204,7 @@ static void classicStandUpRCTrackRightBankToFlat( const TrackElement& trackElement) { return classicStandUpRCTrackFlatToLeftBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackBankedRightQuarterTurn5( @@ -215,7 +215,7 @@ static void classicStandUpRCTrackBankedRightQuarterTurn5( { case 0: { - constexpr ImageIndex map[NumOrthogonalDirections] = { + constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcRightTurn5TilesBanked0_0, kClassicStandUpRcRightTurn5TilesBanked1_0, kClassicStandUpRcRightTurn5TilesBanked2_0, @@ -354,7 +354,7 @@ static void classicStandUpRCTrackBankedRightQuarterTurn5( case 6: { - constexpr ImageIndex map[NumOrthogonalDirections] = { + constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcRightTurn5TilesBanked0_4, kClassicStandUpRcRightTurn5TilesBanked1_4, kClassicStandUpRcRightTurn5TilesBanked2_4, @@ -389,7 +389,7 @@ static void classicStandUpRCTrackBankedLeftQuarterTurn5( const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; - direction = (direction + 1) % NumOrthogonalDirections; + direction = (direction + 1) % kNumOrthogonalDirections; return classicStandUpRCTrackBankedRightQuarterTurn5(session, ride, trackSequence, direction, height, trackElement); } @@ -397,7 +397,7 @@ static void classicStandUpRCTrackLeftBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcLeftBankedTo25DegUp0, kClassicStandUpRcLeftBankedTo25DegUp1, kClassicStandUpRcLeftBankedTo25DegUp2, @@ -428,7 +428,7 @@ static void classicStandUpRCTrackRightBankTo25DegUp( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcRightBankedTo25DegUp0, kClassicStandUpRcRightBankedTo25DegUp1, kClassicStandUpRcRightBankedTo25DegUp2, @@ -459,7 +459,7 @@ static void classicStandUpRCTrack25DegUpToLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRc25DegUpToFlatLeftBanked0, kClassicStandUpRc25DegUpToFlatLeftBanked1, kClassicStandUpRc25DegUpToFlatLeftBanked2, @@ -490,7 +490,7 @@ static void classicStandUpRCTrack25DegUpToRightBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRc25DegUpToFlatRightBanked0, kClassicStandUpRc25DegUpToFlatRightBanked1, kClassicStandUpRc25DegUpToFlatRightBanked2, @@ -522,7 +522,7 @@ static void classicStandUpRCTrackLeftBankTo25DegDown( const TrackElement& trackElement) { classicStandUpRCTrack25DegUpToRightBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackRightBankTo25DegDown( @@ -530,7 +530,7 @@ static void classicStandUpRCTrackRightBankTo25DegDown( const TrackElement& trackElement) { classicStandUpRCTrack25DegUpToLeftBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrack25DegDownToLeftBank( @@ -538,7 +538,7 @@ static void classicStandUpRCTrack25DegDownToLeftBank( const TrackElement& trackElement) { classicStandUpRCTrackRightBankTo25DegUp( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrack25DegDownToRightBank( @@ -546,14 +546,14 @@ static void classicStandUpRCTrack25DegDownToRightBank( const TrackElement& trackElement) { classicStandUpRCTrackLeftBankTo25DegUp( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackLeftBank( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[NumOrthogonalDirections] = { + static constexpr ImageIndex map[kNumOrthogonalDirections] = { kClassicStandUpRcLeftBanked0, kClassicStandUpRcLeftBanked1, kClassicStandUpRcLeftBanked2, @@ -578,14 +578,14 @@ static void classicStandUpRCTrackRightBank( const TrackElement& trackElement) { return classicStandUpRCTrackLeftBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackLeftEighthBankToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[5][NumOrthogonalDirections] = { + static constexpr ImageIndex map[5][kNumOrthogonalDirections] = { { kClassicStandUpRcLeftBankedOrthogonalToDiag0_0, kClassicStandUpRcLeftBankedOrthogonalToDiag1_0, kClassicStandUpRcLeftBankedOrthogonalToDiag2_0, kClassicStandUpRcLeftBankedOrthogonalToDiag3_0 }, { kClassicStandUpRcLeftBankedOrthogonalToDiag0_1, kClassicStandUpRcLeftBankedOrthogonalToDiag1_1, @@ -738,7 +738,7 @@ static void classicStandUpRCTrackRightEighthBankToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[5][NumOrthogonalDirections] = { + static constexpr ImageIndex map[5][kNumOrthogonalDirections] = { { kClassicStandUpRcRightBankedOrthogonalToDiag0_0, kClassicStandUpRcRightBankedOrthogonalToDiag1_0, kClassicStandUpRcRightBankedOrthogonalToDiag2_0, kClassicStandUpRcRightBankedOrthogonalToDiag3_0 }, { kClassicStandUpRcRightBankedOrthogonalToDiag0_1, kClassicStandUpRcRightBankedOrthogonalToDiag1_1, @@ -892,7 +892,7 @@ static void classicStandUpRCTrackLeftEighthDiagBankToOrthogonal( const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - direction = (direction + 2) % NumOrthogonalDirections; + direction = (direction + 2) % kNumOrthogonalDirections; classicStandUpRCTrackRightEighthBankToDiag(session, ride, trackSequence, direction, height, trackElement); } @@ -901,7 +901,7 @@ static void classicStandUpRCTrackRightEighthDiagBankToOrthogonal( const TrackElement& trackElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; - direction = (direction + 3) % NumOrthogonalDirections; + direction = (direction + 3) % kNumOrthogonalDirections; classicStandUpRCTrackLeftEighthBankToDiag(session, ride, trackSequence, direction, height, trackElement); } @@ -909,7 +909,7 @@ static void classicStandUpRCTrackRightBankedQuarterTurn3( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr ImageIndex map[4][NumOrthogonalDirections] = { + static constexpr ImageIndex map[4][kNumOrthogonalDirections] = { { kClassicStandUpRcRightTurn3TilesBanked0_0, kClassicStandUpRcRightTurn3TilesBanked1_0, kClassicStandUpRcRightTurn3TilesBanked2_0, kClassicStandUpRcRightTurn3TilesBanked3_0 }, { ImageIndexUndefined, ImageIndexUndefined, ImageIndexUndefined, ImageIndexUndefined }, @@ -1006,7 +1006,7 @@ static void classicStandUpRCTrackLeftBankedQuarterTurn3( const TrackElement& trackElement) { trackSequence = kMapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; - direction = (direction + 1) % NumOrthogonalDirections; + direction = (direction + 1) % kNumOrthogonalDirections; classicStandUpRCTrackRightBankedQuarterTurn3(session, ride, trackSequence, direction, height, trackElement); } @@ -1093,7 +1093,7 @@ static void classicStandUpRCTrackDiagLeftBankToFlat( { trackSequence = kMapReversedDiagonalStraight[trackSequence]; return classicStandUpRCTrackDiagFlatToRightBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackDiagRightBankToFlat( @@ -1102,7 +1102,7 @@ static void classicStandUpRCTrackDiagRightBankToFlat( { trackSequence = kMapReversedDiagonalStraight[trackSequence]; return classicStandUpRCTrackDiagFlatToLeftBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } static void classicStandUpRCTrackDiagLeftBank( @@ -1121,7 +1121,7 @@ static void classicStandUpRCTrackDiagRightBank( { trackSequence = kMapReversedDiagonalStraight[trackSequence]; return classicStandUpRCTrackDiagLeftBank( - session, ride, trackSequence, (direction + 2) % NumOrthogonalDirections, height, trackElement); + session, ride, trackSequence, (direction + 2) % kNumOrthogonalDirections, height, trackElement); } template @@ -1234,7 +1234,7 @@ static void classicStandUpRCTrackDiag25DegDownToLeftBank( const TrackElement& trackElement) { trackSequence = kMapReversedDiagonalStraight[trackSequence]; - direction = (direction + 2) % NumOrthogonalDirections; + direction = (direction + 2) % kNumOrthogonalDirections; classicStandUpRCTrackDiagRightBankTo25DegUp(session, ride, trackSequence, direction, height, trackElement); } @@ -1243,7 +1243,7 @@ static void classicStandUpRCTrackDiag25DegDownToRightBank( const TrackElement& trackElement) { trackSequence = kMapReversedDiagonalStraight[trackSequence]; - direction = (direction + 2) % NumOrthogonalDirections; + direction = (direction + 2) % kNumOrthogonalDirections; classicStandUpRCTrackDiagLeftBankTo25DegUp(session, ride, trackSequence, direction, height, trackElement); } @@ -1357,7 +1357,7 @@ static void classicStandUpRCTrackDiagLeftBankTo25DegDown( const TrackElement& trackElement) { trackSequence = kMapReversedDiagonalStraight[trackSequence]; - direction = (direction + 2) % NumOrthogonalDirections; + direction = (direction + 2) % kNumOrthogonalDirections; classicStandUpRCTrackDiag25DegUpToRightBank(session, ride, trackSequence, direction, height, trackElement); } @@ -1366,7 +1366,7 @@ static void classicStandUpRCTrackDiagRightBankTo25DegDown( const TrackElement& trackElement) { trackSequence = kMapReversedDiagonalStraight[trackSequence]; - direction = (direction + 2) % NumOrthogonalDirections; + direction = (direction + 2) % kNumOrthogonalDirections; classicStandUpRCTrackDiag25DegUpToLeftBank(session, ride, trackSequence, direction, height, trackElement); } diff --git a/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp index 8415910ec7..4f71375323 100644 --- a/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ClassicWoodenRollerCoaster.cpp @@ -767,7 +767,7 @@ static void ClassicWoodenRCTrackBankedRightQuarterTurn5( }, }, }; - static constexpr WoodenSupportSubType supportType[NumOrthogonalDirections][7] = { + static constexpr WoodenSupportSubType supportType[kNumOrthogonalDirections][7] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, @@ -1145,7 +1145,7 @@ static void ClassicWoodenRCTrackLeftEighthBankToDiag( }, }; - static constexpr WoodenSupportSubType supportType[NumOrthogonalDirections][5] = { + static constexpr WoodenSupportSubType supportType[kNumOrthogonalDirections][5] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, WoodenSupportSubType::Null }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, @@ -1343,7 +1343,7 @@ static void ClassicWoodenRCTrackRightEighthBankToDiag( }, }; - static constexpr WoodenSupportSubType supportType[NumOrthogonalDirections][5] = { + static constexpr WoodenSupportSubType supportType[kNumOrthogonalDirections][5] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2, WoodenSupportSubType::Null }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index c93bf4a950..f788ba22c6 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -23,19 +23,19 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::TubesInverted; -static constexpr ImageIndex kCompactInvertedDiagFlatImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kCompactInvertedDiagFlatImages[2][kNumOrthogonalDirections] = { { 26781, 26782, 26783, 26784 }, { 26809, 26810, 26811, 26812 }, }; -static constexpr ImageIndex kCompactInvertedDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr ImageIndex kCompactInvertedDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 1, SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 1, }; -static constexpr ImageIndex kCompactInvertedDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kCompactInvertedDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 1, diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp index 886af3df13..351a90320e 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.hpp @@ -28,21 +28,21 @@ static constexpr uint32_t kCorkscrewRcBlockBrakeNwSeOpen = 16233; static constexpr uint32_t kCorkscrewRcBlockBrakeSwNeClosed = 16234; static constexpr uint32_t kCorkscrewRcBlockBrakeNwSeClosed = 16235; -static constexpr uint32_t kCorkscrewRcBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t kCorkscrewRcBlockBrakeImages[kNumOrthogonalDirections][2] = { { kCorkscrewRcBlockBrakeSwNeOpen, kCorkscrewRcBlockBrakeSwNeClosed }, { kCorkscrewRcBlockBrakeNwSeOpen, kCorkscrewRcBlockBrakeNwSeClosed }, { kCorkscrewRcBlockBrakeSwNeOpen, kCorkscrewRcBlockBrakeSwNeClosed }, { kCorkscrewRcBlockBrakeNwSeOpen, kCorkscrewRcBlockBrakeNwSeClosed }, }; -static constexpr const uint32_t kCorkscrewRcDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t kCorkscrewRcDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_CORKSCREW_DIAG_BRAKES, SPR_G2_CORKSCREW_DIAG_BRAKES + 1, SPR_G2_CORKSCREW_DIAG_BRAKES, SPR_G2_CORKSCREW_DIAG_BRAKES + 1, }; -static constexpr const uint32_t kCorkscrewRcDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t kCorkscrewRcDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_CORKSCREW_DIAG_BRAKES + 3, SPR_G2_CORKSCREW_DIAG_BRAKES + 5, @@ -6398,7 +6398,7 @@ static void CorkscrewRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex kImages[2][NumOrthogonalDirections] = { + constexpr ImageIndex kImages[2][kNumOrthogonalDirections] = { { 16634, 16635, 16636, 16637 }, { 16696, 16697, 16698, 16699 }, }; diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index e31b171ee4..ce49693290 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -24,7 +24,7 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::TubesInverted; -static constexpr const uint32_t InvertedRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t InvertedRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_BM_INVERT_DIAG_BRAKES, SPR_G2_BM_INVERT_DIAG_BRAKES + 1, SPR_G2_BM_INVERT_DIAG_BRAKES, diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index e6d596bfaa..da428b9044 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -33,7 +33,7 @@ static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_OPEN_2 = 18081; static constexpr uint32_t GIGA_COASTER_BRAKE_SW_NE_CLOSED_2 = 18082; static constexpr uint32_t GIGA_COASTER_BRAKE_NW_SE_CLOSED_2 = 18083; -static constexpr uint32_t _GigaCoasterBrakeImages[NumOrthogonalDirections][2][2] = { +static constexpr uint32_t _GigaCoasterBrakeImages[kNumOrthogonalDirections][2][2] = { { { GIGA_COASTER_BRAKE_SW_NE_OPEN_1, GIGA_COASTER_BRAKE_SW_NE_OPEN_2 }, { GIGA_COASTER_BRAKE_SW_NE_CLOSED_1, GIGA_COASTER_BRAKE_SW_NE_CLOSED_2 } }, { { GIGA_COASTER_BRAKE_NW_SE_OPEN_1, GIGA_COASTER_BRAKE_NW_SE_OPEN_2 }, @@ -48,7 +48,7 @@ static constexpr uint32_t _GigaCoasterBrakeImages[NumOrthogonalDirections][2][2] * second level: background, foreground * third level: direction */ -static constexpr uint32_t GigaDiagBrakeImages[2][2][NumOrthogonalDirections] = { +static constexpr uint32_t GigaDiagBrakeImages[2][2][kNumOrthogonalDirections] = { { // Open { @@ -5946,7 +5946,7 @@ static void GigaRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 18462, 18463, 18464, 18465 }, { 18524, 18525, 18526, 18527 }, }; diff --git a/src/openrct2/ride/coaster/HybridCoaster.cpp b/src/openrct2/ride/coaster/HybridCoaster.cpp index c057db25f1..634f6b4a42 100644 --- a/src/openrct2/ride/coaster/HybridCoaster.cpp +++ b/src/openrct2/ride/coaster/HybridCoaster.cpp @@ -1380,7 +1380,7 @@ namespace HybridRC PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { SPR_G2_HYBRID_TRACK_FLAT_DIAGONAL + 0, SPR_G2_HYBRID_TRACK_FLAT_DIAGONAL + 1, SPR_G2_HYBRID_TRACK_FLAT_DIAGONAL + 0, SPR_G2_HYBRID_TRACK_FLAT_DIAGONAL + 1 }, { SPR_G2_HYBRID_LIFT_TRACK_FLAT_DIAGONAL + 0, SPR_G2_HYBRID_LIFT_TRACK_FLAT_DIAGONAL + 1, diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 84a7702809..4d92f977af 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -22,12 +22,12 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::Boxed; -static constexpr ImageIndex kInvertedRCDiagFlatImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kInvertedRCDiagFlatImages[2][kNumOrthogonalDirections] = { { 27555, 27556, 27557, 27558 }, { 27611, 27612, 27613, 27614 }, }; -static constexpr ImageIndex kInvertedRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr ImageIndex kInvertedRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_BM_INVERT_DIAG_BRAKES, SPR_G2_BM_INVERT_DIAG_BRAKES + 1, SPR_G2_BM_INVERT_DIAG_BRAKES, diff --git a/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp b/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp index 2cd8425777..031b5cd9a9 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp @@ -24,19 +24,19 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::TubesInverted; -static constexpr ImageIndex kLaydownDiagFlatImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kLaydownDiagFlatImages[2][kNumOrthogonalDirections] = { { 26781, 26782, 26783, 26784 }, { 26809, 26810, 26811, 26812 }, }; -static constexpr ImageIndex kLaydownDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr ImageIndex kLaydownDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 2, SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 2, }; -static constexpr ImageIndex kLaydownDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kLaydownDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_SLC_DIAG_BRAKES, SPR_G2_SLC_DIAG_BRAKES + 2, @@ -3800,7 +3800,7 @@ static void LayDownRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr CoordsXYZ boundsOffsets[NumOrthogonalDirections] = { + constexpr CoordsXYZ boundsOffsets[kNumOrthogonalDirections] = { { -16, -16, -2 }, { -16, -16, -2 }, { -16, -16, -2 }, diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 5f7d161f37..e521bc60e6 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -28,7 +28,7 @@ static constexpr uint32_t LIM_LAUNCHED_RC_BLOCK_BRAKE_NW_SE_OPEN = 15021; static constexpr uint32_t LIM_LAUNCHED_RC_BLOCK_BRAKE_SW_NE_CLOSED = 15022; static constexpr uint32_t LIM_LAUNCHED_RC_BLOCK_BRAKE_NW_SE_CLOSED = 15023; -static constexpr uint32_t _LimLauncherBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _LimLauncherBlockBrakeImages[kNumOrthogonalDirections][2] = { { LIM_LAUNCHED_RC_BLOCK_BRAKE_SW_NE_OPEN, LIM_LAUNCHED_RC_BLOCK_BRAKE_SW_NE_CLOSED }, { LIM_LAUNCHED_RC_BLOCK_BRAKE_NW_SE_OPEN, LIM_LAUNCHED_RC_BLOCK_BRAKE_NW_SE_CLOSED }, { LIM_LAUNCHED_RC_BLOCK_BRAKE_SW_NE_OPEN, LIM_LAUNCHED_RC_BLOCK_BRAKE_SW_NE_CLOSED }, diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index b81704f6e0..b7da1e4a20 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -29,7 +29,7 @@ static constexpr auto SPR_LOOPING_RC_BOOSTER_NW_SE = 15011; static constexpr auto SPR_LOOPING_RC_FLAT_CHAINED_SW_NE = 15016; static constexpr auto SPR_LOOPING_RC_FLAT_CHAINED_NW_SE = 15017; -static constexpr const uint32_t LoopingRCDiagBrakeImages[2 * NumOrthogonalDirections] = { +static constexpr const uint32_t LoopingRCDiagBrakeImages[2 * kNumOrthogonalDirections] = { SPR_G2_LOOPING_DIAG_BRAKES, SPR_G2_LOOPING_DIAG_BRAKES + 2, SPR_G2_LOOPING_DIAG_BRAKES, SPR_G2_LOOPING_DIAG_BRAKES + 2, SPR_G2_LOOPING_DIAG_BRAKES + 1, SPR_G2_LOOPING_DIAG_BRAKES + 3, SPR_G2_LOOPING_DIAG_BRAKES + 1, SPR_G2_LOOPING_DIAG_BRAKES + 3, @@ -5717,7 +5717,7 @@ static void LoopingRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 15420, 15421, 15422, 15423 }, { 15448, 15449, 15450, 15451 }, }; diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 69f329b01f..32db36a387 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -4241,7 +4241,7 @@ static void MineRideTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[NumOrthogonalDirections] = { 19612, 19613, 19614, 19615 }; + constexpr ImageIndex images[kNumOrthogonalDirections] = { 19612, 19613, 19614, 19615 }; TrackPaintUtilDiagTilesPaint( session, 3, height, direction, trackSequence, images, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 24e603a244..c876df0cc0 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -28,21 +28,21 @@ static constexpr uint32_t MINE_TRAIN_BLOCK_BRAKE_NW_SE_OPEN = 20061; static constexpr uint32_t MINE_TRAIN_BLOCK_BRAKE_SW_NE_CLOSED = 20062; static constexpr uint32_t MINE_TRAIN_BLOCK_BRAKE_NW_SE_CLOSED = 20063; -static constexpr uint32_t _MineTrainBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _MineTrainBlockBrakeImages[kNumOrthogonalDirections][2] = { { MINE_TRAIN_BLOCK_BRAKE_SW_NE_OPEN, MINE_TRAIN_BLOCK_BRAKE_SW_NE_CLOSED }, { MINE_TRAIN_BLOCK_BRAKE_NW_SE_OPEN, MINE_TRAIN_BLOCK_BRAKE_NW_SE_CLOSED }, { MINE_TRAIN_BLOCK_BRAKE_SW_NE_OPEN, MINE_TRAIN_BLOCK_BRAKE_SW_NE_CLOSED }, { MINE_TRAIN_BLOCK_BRAKE_NW_SE_OPEN, MINE_TRAIN_BLOCK_BRAKE_NW_SE_CLOSED }, }; -static constexpr const uint32_t MinetrainRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t MinetrainRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_MINETRAIN_DIAG_BRAKES, SPR_G2_MINETRAIN_DIAG_BRAKES + 1, SPR_G2_MINETRAIN_DIAG_BRAKES, SPR_G2_MINETRAIN_DIAG_BRAKES + 1, }; -static constexpr const uint32_t MinetrainRCDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t MinetrainRCDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_MINETRAIN_DIAG_BRAKES + 3, SPR_G2_MINETRAIN_DIAG_BRAKES + 5, @@ -58,7 +58,7 @@ static constexpr const uint32_t MinetrainRCDiagBlockBrakeImages[2][NumOrthogonal }; // Magic number 4 refers to the number of track blocks in a diagonal track element -static constexpr const WoodenSupportSubType MineTrainRCDiagonalSupports[4][NumOrthogonalDirections] = { +static constexpr const WoodenSupportSubType MineTrainRCDiagonalSupports[4][kNumOrthogonalDirections] = { { WoodenSupportSubType::Null, WoodenSupportSubType::Null, WoodenSupportSubType::Null, WoodenSupportSubType::Null }, { WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner3 }, @@ -5417,7 +5417,7 @@ static void MineTrainRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 20358, 20359, 20360, 20361 }, { 20386, 20387, 20388, 20389 }, }; diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 3a620d3929..bef2ddeebb 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -28,7 +28,7 @@ static constexpr uint32_t MINI_RC_BLOCK_BRAKE_NW_SE_OPEN = 18743; static constexpr uint32_t MINI_RC_BLOCK_BRAKE_SW_NE_CLOSED = 18744; static constexpr uint32_t MINI_RC_BLOCK_BRAKE_NW_SE_CLOSED = 18745; -static constexpr uint32_t _MiniRCBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _MiniRCBlockBrakeImages[kNumOrthogonalDirections][2] = { { MINI_RC_BLOCK_BRAKE_SW_NE_OPEN, MINI_RC_BLOCK_BRAKE_SW_NE_CLOSED }, { MINI_RC_BLOCK_BRAKE_NW_SE_OPEN, MINI_RC_BLOCK_BRAKE_NW_SE_CLOSED }, { MINI_RC_BLOCK_BRAKE_SW_NE_OPEN, MINI_RC_BLOCK_BRAKE_SW_NE_CLOSED }, @@ -5615,7 +5615,7 @@ static void MiniRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 19124, 19125, 19126, 19127 }, { 19186, 19187, 19188, 19189 }, }; diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 3e6747436e..0f56de3a48 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -23,7 +23,7 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::Fork; -static constexpr ImageIndex kMiniSuspendedRCFlatImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kMiniSuspendedRCFlatImages[2][kNumOrthogonalDirections] = { { 28491, 28492, 28493, 28494 }, { 28507, 28508, 28509, 28510 }, }; diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 25d5055eef..016c8368b7 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -38,7 +38,7 @@ static constexpr uint32_t MULTI_DIM_INVERTED_BLOCK_BRAKE_NW_SE_OPEN = 26552; static constexpr uint32_t MULTI_DIM_INVERTED_BLOCK_BRAKE_SW_NE_CLOSED = 26553; static constexpr uint32_t MULTI_DIM_INVERTED_BLOCK_BRAKE_NW_SE_CLOSED = 26554; -static constexpr const uint32_t MultidimDiagBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t MultidimDiagBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES, SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES + 1, @@ -53,7 +53,7 @@ static constexpr const uint32_t MultidimDiagBrakeImages[2][NumOrthogonalDirectio }, }; -static constexpr const uint32_t MultidimDiagBlockBrakeImages[2][2][NumOrthogonalDirections] = { +static constexpr const uint32_t MultidimDiagBlockBrakeImages[2][2][kNumOrthogonalDirections] = { { { SPR_G2_MULTIDIM_UPRIGHT_DIAG_BRAKES + 3, @@ -174,7 +174,7 @@ static void MultiDimensionRCTrackStation( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr uint32_t imageIds[NumOrthogonalDirections][3] = { + static constexpr uint32_t imageIds[kNumOrthogonalDirections][3] = { { 15810, MULTI_DIM_STATION_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_STATION_BLOCK_BRAKE_SW_NE_CLOSED }, { 15811, MULTI_DIM_STATION_BLOCK_BRAKE_NW_SE_OPEN, MULTI_DIM_STATION_BLOCK_BRAKE_NW_SE_CLOSED }, { 15810, MULTI_DIM_STATION_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_STATION_BLOCK_BRAKE_SW_NE_CLOSED }, @@ -14213,7 +14213,7 @@ static void MultiDimensionRCTrackBlockBrakes( if (!trackElement.IsInverted()) { - static constexpr uint32_t imageIds[NumOrthogonalDirections][2] = { + static constexpr uint32_t imageIds[kNumOrthogonalDirections][2] = { { MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_SW_NE_CLOSED }, { MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_NW_SE_OPEN, MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_NW_SE_CLOSED }, { MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_NON_INVERTED_BLOCK_BRAKE_SW_NE_CLOSED }, @@ -14230,7 +14230,7 @@ static void MultiDimensionRCTrackBlockBrakes( } else { - static constexpr uint32_t imageIds[NumOrthogonalDirections][2] = { + static constexpr uint32_t imageIds[kNumOrthogonalDirections][2] = { { MULTI_DIM_INVERTED_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_INVERTED_BLOCK_BRAKE_SW_NE_CLOSED }, { MULTI_DIM_INVERTED_BLOCK_BRAKE_NW_SE_OPEN, MULTI_DIM_INVERTED_BLOCK_BRAKE_NW_SE_CLOSED }, { MULTI_DIM_INVERTED_BLOCK_BRAKE_SW_NE_OPEN, MULTI_DIM_INVERTED_BLOCK_BRAKE_SW_NE_CLOSED }, diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 23cfca9763..251b0e4971 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -1948,11 +1948,11 @@ static void SideFrictionRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 21822, 21823, 21824, 21825 }, { 21846, 21847, 21848, 21849 }, }; - const ImageIndex additionalImages[2][NumOrthogonalDirections] = { + const ImageIndex additionalImages[2][kNumOrthogonalDirections] = { { 21826, ImageIndexUndefined, 21827, ImageIndexUndefined }, { 21850, ImageIndexUndefined, 21851, ImageIndexUndefined }, }; diff --git a/src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp b/src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp index a397ffe441..e4e41c9c93 100644 --- a/src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SingleRailRollerCoaster.cpp @@ -1532,7 +1532,7 @@ namespace SingleRailRC PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { SPR_G2_SINGLE_RAIL_TRACK_FLAT_DIAGONAL + 0, SPR_G2_SINGLE_RAIL_TRACK_FLAT_DIAGONAL + 1, SPR_G2_SINGLE_RAIL_TRACK_FLAT_DIAGONAL + 0, SPR_G2_SINGLE_RAIL_TRACK_FLAT_DIAGONAL + 1 }, { SPR_G2_SINGLE_RAIL_LIFT_TRACK_FLAT_DIAGONAL + 0, SPR_G2_SINGLE_RAIL_LIFT_TRACK_FLAT_DIAGONAL + 1, diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index bbbaa9202d..1e0072ceee 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -28,21 +28,21 @@ static constexpr uint32_t STAND_UP_BLOCK_BRAKE_NW_SE_OPEN = 25572; static constexpr uint32_t STAND_UP_BLOCK_BRAKE_SW_NE_CLOSED = 25573; static constexpr uint32_t STAND_UP_BLOCK_BRAKE_NW_SE_CLOSED = 25574; -static constexpr uint32_t _StandUpBlockBrakeImages[NumOrthogonalDirections][2] = { +static constexpr uint32_t _StandUpBlockBrakeImages[kNumOrthogonalDirections][2] = { { STAND_UP_BLOCK_BRAKE_SW_NE_OPEN, STAND_UP_BLOCK_BRAKE_SW_NE_CLOSED }, { STAND_UP_BLOCK_BRAKE_NW_SE_OPEN, STAND_UP_BLOCK_BRAKE_NW_SE_CLOSED }, { STAND_UP_BLOCK_BRAKE_SW_NE_OPEN, STAND_UP_BLOCK_BRAKE_SW_NE_CLOSED }, { STAND_UP_BLOCK_BRAKE_NW_SE_OPEN, STAND_UP_BLOCK_BRAKE_NW_SE_CLOSED }, }; -static constexpr const uint32_t StandupRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t StandupRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_STANDUP_DIAG_BRAKES, SPR_G2_STANDUP_DIAG_BRAKES + 1, SPR_G2_STANDUP_DIAG_BRAKES, SPR_G2_STANDUP_DIAG_BRAKES + 1, }; -static constexpr const uint32_t StandupRCDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t StandupRCDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_STANDUP_DIAG_BRAKES + 3, SPR_G2_STANDUP_DIAG_BRAKES + 5, @@ -5997,7 +5997,7 @@ static void StandUpRCTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 25691, 25692, 25693, 25694 }, { 25753, 25754, 25755, 25756 }, }; diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 10d86a786d..00df573585 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -23,7 +23,7 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::Stick; -static constexpr const uint32_t SteeplechaseRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t SteeplechaseRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_STEEPLECHASE_DIAG_BRAKES, SPR_G2_STEEPLECHASE_DIAG_BRAKES + 1, SPR_G2_STEEPLECHASE_DIAG_BRAKES, @@ -1420,7 +1420,7 @@ static void SteeplechaseTrackDiagFlat( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - constexpr ImageIndex images[2][NumOrthogonalDirections] = { + constexpr ImageIndex images[2][kNumOrthogonalDirections] = { { 28741, 28742, 28743, 28744 }, { 28757, 28758, 28759, 28760 }, }; diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index cf8f536cbd..98976e87e5 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -22,7 +22,7 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::Tubes; -static constexpr ImageIndex kSuspendedSwingingRCDiagFlatImages[2][NumOrthogonalDirections] = { +static constexpr ImageIndex kSuspendedSwingingRCDiagFlatImages[2][kNumOrthogonalDirections] = { { 26183, 26184, 26185, 26186 }, { 26211, 26212, 26213, 26214 }, }; diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index d071990b7f..9846cecf99 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -161,7 +161,7 @@ static constexpr uint32_t _wild_mouse_brakes_image_ids[4] = { SPR_WILD_MOUSE_BRAKES_NW_SE, }; -static constexpr uint32_t _wild_mouse_block_brakes_image_ids[NumOrthogonalDirections][2] = { +static constexpr uint32_t _wild_mouse_block_brakes_image_ids[kNumOrthogonalDirections][2] = { { SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE_OPEN, SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE_CLOSED }, { SPR_WILD_MOUSE_BLOCK_BRAKES_NW_SE_OPEN, SPR_WILD_MOUSE_BLOCK_BRAKES_NW_SE_CLOSED }, { SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE_OPEN, SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE_CLOSED }, diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index a56505dbc2..3a385f8707 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -456,14 +456,14 @@ static constexpr uint32_t _wooden_rc_station_block_brakes_image_ids[4][2] = { { SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_OPEN_NW_SE, SPR_G2_WOODEN_RC_STATION_BLOCK_BRAKE_CLOSED_NW_SE }, }; -static constexpr const uint32_t WoodenRCDiagBrakeImages[NumOrthogonalDirections] = { +static constexpr const uint32_t WoodenRCDiagBrakeImages[kNumOrthogonalDirections] = { SPR_G2_WOODEN_RC_DIAG_BRAKES, SPR_G2_WOODEN_RC_DIAG_BRAKES + 1, SPR_G2_WOODEN_RC_DIAG_BRAKES, SPR_G2_WOODEN_RC_DIAG_BRAKES + 1, }; -static constexpr const uint32_t WoodenRCDiagBlockBrakeImages[2][NumOrthogonalDirections] = { +static constexpr const uint32_t WoodenRCDiagBlockBrakeImages[2][kNumOrthogonalDirections] = { { SPR_G2_WOODEN_RC_DIAG_BRAKES + 3, SPR_G2_WOODEN_RC_DIAG_BRAKES + 5, @@ -1453,7 +1453,7 @@ static void WoodenRCTrackRightQuarterTurn5( }, }, }; - static WoodenSupportSubType supportType[NumOrthogonalDirections][7] = { + static WoodenSupportSubType supportType[kNumOrthogonalDirections][7] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, @@ -1927,7 +1927,7 @@ static void WoodenRCTrackBankedRightQuarterTurn5( }, }, }; - static WoodenSupportSubType supportType[NumOrthogonalDirections][7] = { + static WoodenSupportSubType supportType[kNumOrthogonalDirections][7] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Null, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, @@ -9605,7 +9605,7 @@ static void WoodenRCTrackDiagBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr SpriteBoundBox2 imageIds[4][NumOrthogonalDirections][2] = { + static constexpr SpriteBoundBox2 imageIds[4][kNumOrthogonalDirections][2] = { { // sequence 0 { @@ -9748,7 +9748,7 @@ static void WoodenRCTrackDiagBlockBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr SpriteBoundBox2 imageIds[2][4][NumOrthogonalDirections][2] = { + static constexpr SpriteBoundBox2 imageIds[2][4][kNumOrthogonalDirections][2] = { { { // sequence 0 diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/WoodenRollerCoaster.h index 8c194a7937..a30353cf87 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.h @@ -29,7 +29,7 @@ struct SpriteBoundBox2 }; // Magic number 4 refers to the number of track blocks in a diagonal track element -static constexpr const WoodenSupportSubType WoodenRCDiagonalSupports[4][NumOrthogonalDirections] = { +static constexpr const WoodenSupportSubType WoodenRCDiagonalSupports[4][kNumOrthogonalDirections] = { { WoodenSupportSubType::Null, WoodenSupportSubType::Null, WoodenSupportSubType::Null, WoodenSupportSubType::Null }, // sequence 0 { WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner2, diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index a7af33b1c6..2b5b58e58a 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -343,7 +343,7 @@ static void PaintMiniHelicoptersTrackSpinningTunnel( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const uint32_t sprites[NumOrthogonalDirections][2] = { + const uint32_t sprites[kNumOrthogonalDirections][2] = { { SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW, 28773 }, { SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_SE_NW, 28774 }, { SPR_TRACK_SUBMARINE_RIDE_MINI_HELICOPTERS_FLAT_NE_SW, 28773 }, diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 47ca2f4cc4..a058bb12d8 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -1096,7 +1096,7 @@ static void PaintMiniatureRailwayTrackLeftQuarterTurn5Tiles( PaintMiniatureRailwayTrackRightQuarterTurn5Tiles(session, ride, trackSequence, (direction + 1) % 4, height, trackElement); } -static constexpr WoodenSupportSubType s_bend_left_supports_type[NumOrthogonalDirections][4] = { +static constexpr WoodenSupportSubType s_bend_left_supports_type[kNumOrthogonalDirections][4] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, WoodenSupportSubType::NeSw }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, WoodenSupportSubType::NeSw }, @@ -1207,7 +1207,7 @@ static void PaintMiniatureRailwayTrackSBendLeft( PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); } -static constexpr WoodenSupportSubType s_bend_right_supports_type[NumOrthogonalDirections][4] = { +static constexpr WoodenSupportSubType s_bend_right_supports_type[kNumOrthogonalDirections][4] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::NeSw }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner3, WoodenSupportSubType::Corner1, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::NeSw }, @@ -1539,7 +1539,7 @@ static void PaintMiniatureRailwayTrackLeftEighthToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr WoodenSupportSubType supportType[NumOrthogonalDirections][5] = { + static constexpr WoodenSupportSubType supportType[kNumOrthogonalDirections][5] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, @@ -1705,7 +1705,7 @@ static void PaintMiniatureRailwayTrackRightEighthToDiag( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - static constexpr WoodenSupportSubType supportType[NumOrthogonalDirections][5] = { + static constexpr WoodenSupportSubType supportType[kNumOrthogonalDirections][5] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::NeSw, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::NwSe, WoodenSupportSubType::NwSe, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, @@ -1792,7 +1792,7 @@ static void PaintMiniatureRailwayTrackRightEighthToOrthogonal( PaintMiniatureRailwayTrackLeftEighthToDiag(session, ride, trackSequence, (direction + 3) % 4, height, trackElement); } -static constexpr WoodenSupportSubType _diagSupportTypes[NumOrthogonalDirections][4] = { +static constexpr WoodenSupportSubType _diagSupportTypes[kNumOrthogonalDirections][4] = { { WoodenSupportSubType::Null, WoodenSupportSubType::Corner0, WoodenSupportSubType::Corner2, WoodenSupportSubType::NeSw }, { WoodenSupportSubType::Null, WoodenSupportSubType::Corner1, WoodenSupportSubType::Corner3, WoodenSupportSubType::NwSe }, { WoodenSupportSubType::Null, WoodenSupportSubType::Corner2, WoodenSupportSubType::Corner0, WoodenSupportSubType::NeSw }, diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index ef9e805606..c5774d2f9e 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -138,14 +138,14 @@ enum SPR_MONORAIL_DIAG_25_DEG_UP_S_N = 23340, }; -static constexpr uint32_t monorail_track_pieces_flat[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_flat[kNumOrthogonalDirections] = { SPR_MONORAIL_FLAT_SW_NE, SPR_MONORAIL_FLAT_NW_SE, SPR_MONORAIL_FLAT_SW_NE, SPR_MONORAIL_FLAT_NW_SE, }; -static constexpr uint32_t monorail_track_pieces_flat_quarter_turn_5_tiles[NumOrthogonalDirections][5] = { +static constexpr uint32_t monorail_track_pieces_flat_quarter_turn_5_tiles[kNumOrthogonalDirections][5] = { { SPR_MONORAIL_QUARTER_TURN_5_TILES_SW_SE_PART_0, SPR_MONORAIL_QUARTER_TURN_5_TILES_SW_SE_PART_1, @@ -176,28 +176,28 @@ static constexpr uint32_t monorail_track_pieces_flat_quarter_turn_5_tiles[NumOrt }, }; -static constexpr uint32_t monorail_track_pieces_25_deg_up[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_25_deg_up[kNumOrthogonalDirections] = { SPR_MONORAIL_25_DEG_UP_SW_NE, SPR_MONORAIL_25_DEG_UP_NW_SE, SPR_MONORAIL_25_DEG_UP_NE_SW, SPR_MONORAIL_25_DEG_UP_SE_NW, }; -static constexpr uint32_t monorail_track_pieces_flat_to_25_deg_up[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_flat_to_25_deg_up[kNumOrthogonalDirections] = { SPR_MONORAIL_FLAT_TO_25_DEG_UP_SW_NE, SPR_MONORAIL_FLAT_TO_25_DEG_UP_NW_SE, SPR_MONORAIL_FLAT_TO_25_DEG_UP_NE_SW, SPR_MONORAIL_FLAT_TO_25_DEG_UP_SE_NW, }; -static constexpr uint32_t monorail_track_pieces_25_deg_up_to_flat[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_25_deg_up_to_flat[kNumOrthogonalDirections] = { SPR_MONORAIL_25_DEG_UP_TO_FLAT_SW_NE, SPR_MONORAIL_25_DEG_UP_TO_FLAT_NW_SE, SPR_MONORAIL_25_DEG_UP_TO_FLAT_NE_SW, SPR_MONORAIL_25_DEG_UP_TO_FLAT_SE_NW, }; -static constexpr uint32_t monorail_track_pieces_s_bend_left[2][NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_s_bend_left[2][kNumOrthogonalDirections] = { { SPR_MONORAIL_S_BEND_LEFT_SW_NE_PART_0, SPR_MONORAIL_S_BEND_LEFT_SW_NE_PART_1, @@ -212,7 +212,7 @@ static constexpr uint32_t monorail_track_pieces_s_bend_left[2][NumOrthogonalDire }, }; -static constexpr uint32_t monorail_track_pieces_s_bend_right[2][NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_s_bend_right[2][kNumOrthogonalDirections] = { { SPR_MONORAIL_S_BEND_RIGHT_SW_NE_PART_0, SPR_MONORAIL_S_BEND_RIGHT_SW_NE_PART_1, @@ -227,7 +227,7 @@ static constexpr uint32_t monorail_track_pieces_s_bend_right[2][NumOrthogonalDir }, }; -static constexpr uint32_t monorail_track_pieces_flat_quarter_turn_3_tiles[NumOrthogonalDirections][3] = { +static constexpr uint32_t monorail_track_pieces_flat_quarter_turn_3_tiles[kNumOrthogonalDirections][3] = { { SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_1, @@ -360,49 +360,49 @@ static constexpr BoundBoxXY GhostTrainTrackPiecesLeftEightToDiagBoxes[4][4] = { }, }; -static constexpr uint32_t monorail_track_pieces_diag_flat[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_flat[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_FLAT_W_E, SPR_MONORAIL_DIAG_FLAT_N_S, SPR_MONORAIL_DIAG_FLAT_E_W, SPR_MONORAIL_DIAG_FLAT_S_N, }; -static constexpr uint32_t monorail_track_pieces_diag_flat_to_25_deg_up[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_flat_to_25_deg_up[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_W_E, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_N_S, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_E_W, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_S_N, }; -static constexpr uint32_t monorail_track_pieces_diag_25_deg_down_to_flat[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_25_deg_down_to_flat[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_E_W, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_S_N, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_W_E, SPR_MONORAIL_DIAG_FLAT_TO_25_DEG_UP_N_S, }; -static constexpr uint32_t monorail_track_pieces_diag_25_deg_up_to_flat[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_25_deg_up_to_flat[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_W_E, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_N_S, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_E_W, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_S_N, }; -static constexpr uint32_t monorail_track_pieces_diag_flat_to_25_deg_down[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_flat_to_25_deg_down[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_E_W, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_S_N, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_W_E, SPR_MONORAIL_DIAG_25_DEG_UP_TO_FLAT_N_S, }; -static constexpr uint32_t monorail_track_pieces_diag_25_deg_up[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_25_deg_up[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_25_DEG_UP_W_E, SPR_MONORAIL_DIAG_25_DEG_UP_N_S, SPR_MONORAIL_DIAG_25_DEG_UP_E_W, SPR_MONORAIL_DIAG_25_DEG_UP_S_N, }; -static constexpr uint32_t monorail_track_pieces_diag_25_deg_down[NumOrthogonalDirections] = { +static constexpr uint32_t monorail_track_pieces_diag_25_deg_down[kNumOrthogonalDirections] = { SPR_MONORAIL_DIAG_25_DEG_UP_E_W, SPR_MONORAIL_DIAG_25_DEG_UP_S_N, SPR_MONORAIL_DIAG_25_DEG_UP_W_E, diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 20eb46a971..8a2158e31f 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -23,7 +23,7 @@ static constexpr MetalSupportType kSupportType = MetalSupportType::Boxed; -static constexpr ImageIndex kSuspendedMonorailDiagFlatImages[NumOrthogonalDirections] = { 25935, 25936, 25935, 25936 }; +static constexpr ImageIndex kSuspendedMonorailDiagFlatImages[kNumOrthogonalDirections] = { 25935, 25936, 25935, 25936 }; /** rct2: 0x008636F4 */ static void SuspendedMonorailTrackFlat( diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 8a3de624c0..2e1beb6832 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -648,7 +648,7 @@ static void PaintSplashBoatsTrack25DegDown( PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 50 } }); WoodenASupportsPaintSetupRotated( - session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % NumOrthogonalDirections, height, + session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % kNumOrthogonalDirections, height, session.SupportColours, WoodenSupportTransitionType::Up25Deg); if (direction == 0 || direction == 3) @@ -681,7 +681,7 @@ static void PaintSplashBoatsTrackFlatTo25DegDown( PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 34 } }); WoodenASupportsPaintSetupRotated( - session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % NumOrthogonalDirections, height, + session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % kNumOrthogonalDirections, height, session.SupportColours, WoodenSupportTransitionType::Up25DegToFlat); if (direction == 0 || direction == 3) @@ -721,7 +721,7 @@ static void PaintSplashBoatsTrack25DegDownToFlat( PaintAddImageAsParentRotated(session, direction, frontImageId, { 0, 0, height }, { { 0, 27, height }, { 32, 1, 42 } }); WoodenASupportsPaintSetupRotated( - session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % NumOrthogonalDirections, height, + session, kSupportType, WoodenSupportSubType::NeSw, (direction + 2) % kNumOrthogonalDirections, height, session.SupportColours, WoodenSupportTransitionType::FlatToUp25Deg); if (direction == 0 || direction == 3) @@ -826,7 +826,7 @@ static void PaintSplashBoatsTrackLeftQuarterTurn5Tiles( TrackPaintUtilRightQuarterTurn5TilesPaint2( session, height, direction, trackSequence, session.TrackColours, RiverRaftsLeftQuarterTurn5_Side); - static constexpr WoodenSupportSubType supportTypes[NumOrthogonalDirections][7] = { + static constexpr WoodenSupportSubType supportTypes[kNumOrthogonalDirections][7] = { { WoodenSupportSubType::NeSw, WoodenSupportSubType::Null, diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 118921a28b..1dca82ab98 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -62,7 +62,7 @@ static RideId _footpathQueueChain[64]; // This is the coordinates that a user of the bin should move to // rct2: 0x00992A4C -const std::array BinUseOffsets = { +const std::array BinUseOffsets = { CoordsXY{ 11, 16 }, { 16, 21 }, { 21, 16 }, @@ -71,12 +71,12 @@ const std::array BinUseOffsets = { // These are the offsets for bench positions on footpaths, 2 for each edge // rct2: 0x00981F2C, 0x00981F2E -const std::array BenchUseOffsets = { +const std::array BenchUseOffsets = { CoordsXY{ 7, 12 }, { 12, 25 }, { 25, 20 }, { 20, 7 }, { 7, 20 }, { 20, 25 }, { 25, 12 }, { 12, 7 }, }; /** rct2: 0x00981D6C, 0x00981D6E */ -const std::array DirectionOffsets = { +const std::array DirectionOffsets = { CoordsXY{ -1, 0 }, { 0, 1 }, { 1, 0 }, @@ -513,7 +513,7 @@ static void FootpathConnectCorners(const CoordsXY& footpathPos, PathElement* ini std::get<0>(tileElements) = { initialTileElement, footpathPos }; int32_t z = initialTileElement->GetBaseZ(); - for (int32_t initialDirection = 0; initialDirection < NumOrthogonalDirections; initialDirection++) + for (int32_t initialDirection = 0; initialDirection < kNumOrthogonalDirections; initialDirection++) { int32_t direction = initialDirection; auto currentPos = footpathPos + CoordsDirectionDelta[direction]; @@ -2052,7 +2052,7 @@ void FootpathUpdateQueueEntranceBanner(const CoordsXY& footpathPos, TileElement* if (tileElement->AsPath()->IsQueue()) { FootpathQueueChainPush(tileElement->AsPath()->GetRideIndex()); - for (int32_t direction = 0; direction < NumOrthogonalDirections; direction++) + for (int32_t direction = 0; direction < kNumOrthogonalDirections; direction++) { if (tileElement->AsPath()->GetEdges() & (1 << direction)) { @@ -2306,7 +2306,7 @@ void FootpathRemoveEdgesAt(const CoordsXY& footpathPos, TileElement* tileElement FootpathUpdateQueueEntranceBanner(footpathPos, tileElement); bool fixCorners = false; - for (uint8_t direction = 0; direction < NumOrthogonalDirections; direction++) + for (uint8_t direction = 0; direction < kNumOrthogonalDirections; direction++) { int32_t z1 = tileElement->BaseHeight; if (tileElement->GetType() == TileElementType::Path) diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index f9fb66d9ab..30869b7faf 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -181,9 +181,9 @@ extern uint8_t gFootpathConstructSlope; extern uint8_t gFootpathGroundFlags; // Given a direction, this will return how to increase/decrease the x and y coordinates. -extern const std::array DirectionOffsets; -extern const std::array BinUseOffsets; -extern const std::array BenchUseOffsets; +extern const std::array DirectionOffsets; +extern const std::array BinUseOffsets; +extern const std::array BenchUseOffsets; PathElement* MapGetFootpathElement(const CoordsXYZ& coords); void FootpathInterruptPeeps(const CoordsXYZ& footpathPos); diff --git a/src/openrct2/world/Location.hpp b/src/openrct2/world/Location.hpp index 9d46f411c2..df22877063 100644 --- a/src/openrct2/world/Location.hpp +++ b/src/openrct2/world/Location.hpp @@ -19,7 +19,7 @@ constexpr int32_t COORDS_XY_HALF_TILE = (COORDS_XY_STEP / 2); constexpr int32_t COORDS_Z_STEP = 8; constexpr int32_t COORDS_Z_PER_TINY_Z = 16; -constexpr auto NumOrthogonalDirections = 4; +constexpr auto kNumOrthogonalDirections = 4; constexpr int32_t COORDS_NULL = 0xFFFF8000; @@ -550,7 +550,7 @@ inline constexpr Direction DirectionReverse(Direction dir) inline constexpr bool DirectionValid(Direction dir) { - return dir < NumOrthogonalDirections; + return dir < kNumOrthogonalDirections; } /** diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 23bf9028fb..8df830d33f 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -791,7 +791,7 @@ int32_t MapHeightFromSlope(const CoordsXY& coords, int32_t slopeDirection, bool if (!isSloped) return 0; - switch (slopeDirection % NumOrthogonalDirections) + switch (slopeDirection % kNumOrthogonalDirections) { case TILE_ELEMENT_DIRECTION_WEST: return (31 - (coords.x & 31)) / 2; diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index f889baccfd..8b735c5bcf 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -190,7 +190,7 @@ void WallElement::SetAnimationIsBackwards(bool isBackwards) // clang-format off // rct2: 0x009A3FEC -constexpr static uint8_t LandSlopeToWallSlope[][NumOrthogonalDirections] = { +constexpr static uint8_t LandSlopeToWallSlope[][kNumOrthogonalDirections] = { // Top right Bottom right Bottom left Top left { 0, 0, 0, 0 }, { 0, EDGE_SLOPE_UPWARDS, EDGE_SLOPE_DOWNWARDS, 0 },