From dda8c3ecb20f6fdc3f110fde29c4ce639c4bab91 Mon Sep 17 00:00:00 2001 From: Harry-Hopkinson Date: Sun, 28 Apr 2024 14:36:21 +0000 Subject: [PATCH] Rename DiagBlockedSegments to kDiagBlockedSegments --- src/openrct2/ride/TrackPaint.cpp | 7 -- src/openrct2/ride/TrackPaint.h | 7 +- .../ride/coaster/BolligerMabillardTrack.hpp | 4 +- .../ride/coaster/CompactInvertedCoaster.cpp | 4 +- .../ride/coaster/CorkscrewRollerCoaster.cpp | 4 +- .../ride/coaster/FlyingRollerCoaster.cpp | 2 +- .../ride/coaster/InvertedRollerCoaster.cpp | 2 +- .../ride/coaster/JuniorRollerCoaster.cpp | 66 +++++++++---------- .../coaster/LayDownRollerCoasterInverted.cpp | 4 +- .../coaster/MultiDimensionRollerCoaster.cpp | 4 +- .../ride/coaster/StandUpRollerCoaster.cpp | 4 +- src/openrct2/ride/coaster/Steeplechase.cpp | 2 +- .../ride/coaster/WoodenRollerCoaster.cpp | 4 +- src/openrct2/ride/transport/Monorail.cpp | 14 ++-- 14 files changed, 63 insertions(+), 65 deletions(-) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index c35ef3d0df..afea2c0af6 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -50,13 +50,6 @@ static constexpr TileCoordsXY EntranceOffsetEdgeNW[] = { { -1, 0 }, }; -const int32_t DiagBlockedSegments[] = { - EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::bottomRightSide, PaintSegment::rightCorner), - EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::topLeftSide, PaintSegment::topCorner), - EnumsToFlags(PaintSegment::bottomLeftSide, PaintSegment::centre, PaintSegment::bottomCorner, PaintSegment::bottomRightSide), - EnumsToFlags(PaintSegment::bottomLeftSide, PaintSegment::centre, PaintSegment::leftCorner, PaintSegment::topLeftSide), -}; - const MetalSupportPlace DiagSupportPlacement[] = { MetalSupportPlace::LeftCorner, MetalSupportPlace::TopCorner, diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index f4b237c73e..d343ad859a 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -84,7 +84,12 @@ constexpr uint8_t kTrackMap1x4[][4] = { { 0, 1, 2, 3 }, }; -extern const int32_t DiagBlockedSegments[]; +constexpr int32_t kDiagBlockedSegments[] = { + EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::bottomRightSide, PaintSegment::rightCorner), + EnumsToFlags(PaintSegment::centre, PaintSegment::topRightSide, PaintSegment::topLeftSide, PaintSegment::topCorner), + EnumsToFlags(PaintSegment::bottomLeftSide, PaintSegment::centre, PaintSegment::bottomCorner, PaintSegment::bottomRightSide), + EnumsToFlags(PaintSegment::bottomLeftSide, PaintSegment::centre, PaintSegment::leftCorner, PaintSegment::topLeftSide), +}; extern const MetalSupportPlace DiagSupportPlacement[]; enum diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp index eeb43bac0b..92b48332bf 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.hpp @@ -14748,7 +14748,7 @@ static void BolligerMabillardTrackDiagBrakes( MetalASupportsPaintSetup(session, supportType, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -14768,7 +14768,7 @@ static void BolligerMabillardTrackDiagBlockBrakes( MetalASupportsPaintSetup(session, supportType, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index d01bfff6ce..6572e88483 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -6897,7 +6897,7 @@ static void CompactInvertedRCTrackDiagBrakes( session, 3, height + 29, direction, trackSequence, session.TrackColours, CompactInvertedDiagBrakeImages, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); if (trackSequence == 3) @@ -6917,7 +6917,7 @@ static void CompactInvertedRCTrackDiagBlockBrakes( CompactInvertedDiagBlockBrakeImages[trackElement.IsBrakeClosed()], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); if (trackSequence == 3) diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index ae141b643e..066b775b81 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -6668,7 +6668,7 @@ static void CorkscrewRCTrackDiagBrakes( session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -6688,7 +6688,7 @@ static void CorkscrewRCTrackDiagBlockBrakes( session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 4c869ebc89..ce04af730f 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -10161,7 +10161,7 @@ static void FlyingRCTrackDiagBrakesInverted( session, 1, height + 24, direction, trackSequence, session.TrackColours, InvertedRCDiagBrakeImages, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); if (trackSequence == 3) diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index e5b3f15601..f7751b4272 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -6602,7 +6602,7 @@ static void inverted_rc_track_diag_brakes( session, 1, height + 29, direction, trackSequence, session.TrackColours, InvertedRCDiagBrakeImages, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr); - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); if (trackSequence == 3) diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index ec3186b807..4531329270 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -4642,7 +4642,7 @@ static void JuniorRCPaintTrackDiagFlat( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -4662,7 +4662,7 @@ static void JuniorRCTrackDiagBrakes( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -4683,7 +4683,7 @@ static void JuniorRCTrackDiagBlockBrakes( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -4705,7 +4705,7 @@ static void JuniorRCPaintTrackDiag25DegUp( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -4727,7 +4727,7 @@ static void JuniorRCPaintTrackDiagFlatTo25DegUp( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -4750,7 +4750,7 @@ static void JuniorRCPaintTrackDiagFlatTo60DegUp( height + 6, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20); } @@ -4772,7 +4772,7 @@ static void JuniorRCPaintTrackDiag25DegUpToFlat( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -4795,7 +4795,7 @@ static void JuniorRCPaintTrackDiag60DegUpToFlat( height + 13, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 64, 0x20); } @@ -4817,7 +4817,7 @@ static void JuniorRCPaintTrackDiag25DegDown( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -4840,7 +4840,7 @@ static void JuniorRCPaintTrackDiagFlatTo25DegDown( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -4864,7 +4864,7 @@ static void JuniorRCPaintTrackDiagFlatTo60DegDown( height + 7, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -4887,7 +4887,7 @@ static void JuniorRCPaintTrackDiag25DegDownToFlat( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -4911,7 +4911,7 @@ static void JuniorRCPaintTrackDiag60DegDownToFlat( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -4938,7 +4938,7 @@ static void JuniorRCDiagFlatToLeftBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -4965,7 +4965,7 @@ static void JuniorRCDiagFlatToRightBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -4992,7 +4992,7 @@ static void JuniorRCDiagLeftBankToFlatPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -5019,7 +5019,7 @@ static void JuniorRCDiagRightBankToFlatPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -5046,7 +5046,7 @@ static void JuniorRCDiagLeftBankTo25DegUpPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -5073,7 +5073,7 @@ static void JuniorRCDiagRightBankTo25DegUpPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -5100,7 +5100,7 @@ static void JuniorRCDiag25DegUpToLeftBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -5127,7 +5127,7 @@ static void JuniorRCDiag25DegUpToRightBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -5154,7 +5154,7 @@ static void JuniorRCDiagLeftBankTo25DegDownPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -5181,7 +5181,7 @@ static void JuniorRCDiagRightBankTo25DegDownPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -5208,7 +5208,7 @@ static void JuniorRCDiag25DegDownToLeftBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -5235,7 +5235,7 @@ static void JuniorRCDiag25DegDownToRightBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -5271,7 +5271,7 @@ static void JuniorRCDiagLeftBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -5293,7 +5293,7 @@ static void JuniorRCDiagRightBankPaintSetup( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -5547,7 +5547,7 @@ static void JuniorRCPaintTrackDiag60DegUp( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20); } @@ -5570,7 +5570,7 @@ static void JuniorRCPaintTrackDiag60DegDown( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 104, 0x20); } @@ -5594,7 +5594,7 @@ static void JuniorRCPaintTrackDiag25DegUpTo60DegUp( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20); } @@ -5628,7 +5628,7 @@ static void JuniorRCPaintTrackDiag60DegUpTo25DegUp( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20); } @@ -5662,7 +5662,7 @@ static void JuniorRCPaintTrackDiag25DegDownTo60DegDown( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20); } @@ -5686,7 +5686,7 @@ static void JuniorRCPaintTrackDiag60DegDownTo25DegDown( height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 72, 0x20); } diff --git a/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp b/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp index b9712a4112..def663e08e 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoasterInverted.cpp @@ -4076,7 +4076,7 @@ static void LayDownRCTrackDiagBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; TrackPaintUtilDiagTilesPaint( session, -3, height + 24, direction, trackSequence, session.TrackColours, LaydownDiagBrakeImages, @@ -4096,7 +4096,7 @@ static void LayDownRCTrackDiagBlockBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; TrackPaintUtilDiagTilesPaint( session, -3, height + 24, direction, trackSequence, session.TrackColours, diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index dc8fa18a2b..8fd95f3711 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -7710,7 +7710,7 @@ static void MultiDimensionRCTrackDiagBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; if (trackElement.IsInverted()) { TrackPaintUtilDiagTilesPaint( @@ -7748,7 +7748,7 @@ static void MultiDimensionRCTrackDiagBlockBrakes( PaintSession& session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; if (trackElement.IsInverted()) { TrackPaintUtilDiagTilesPaint( diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 8a82ebffe0..c42f950142 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -6340,7 +6340,7 @@ static void StandUpRCTrackDiagBrakes( session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 8, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -6359,7 +6359,7 @@ static void StandUpRCTrackDiagBlockBrakes( session, MetalSupportType::Tubes, DiagSupportPlacement[direction], 8, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 5648ba1b18..b37850ab72 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -1642,7 +1642,7 @@ static void SteeplechaseTrackDiagBrakes( session, MetalSupportType::Stick, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 264ff23bf0..30e3430360 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -9732,7 +9732,7 @@ static void WoodenRCTrackDiagBrakes( session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -10003,7 +10003,7 @@ static void WoodenRCTrackDiagBlockBrakes( session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 856019b25d..590907ce4f 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -1168,7 +1168,7 @@ static void PaintMonorailTrackDiagFlat( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 32, 0x20); } @@ -1190,7 +1190,7 @@ static void PaintMonorailTrackDiag25DegUp( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 8, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -1212,7 +1212,7 @@ static void PaintMonorailTrackDiagFlatTo25DegUp( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); } @@ -1234,7 +1234,7 @@ static void PaintMonorailTrackDiag25DegUpToFlat( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 4, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -1256,7 +1256,7 @@ static void PaintMonorailTrackDiag25DegDown( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 8, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -1278,7 +1278,7 @@ static void PaintMonorailTrackDiagFlatTo25DegDown( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 4, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 56, 0x20); } @@ -1300,7 +1300,7 @@ static void PaintMonorailTrackDiag25DegDownToFlat( session, MetalSupportType::Boxed, DiagSupportPlacement[direction], 0, height, session.SupportColours); } - int32_t blockedSegments = DiagBlockedSegments[trackSequence]; + int32_t blockedSegments = kDiagBlockedSegments[trackSequence]; PaintUtilSetSegmentSupportHeight(session, PaintUtilRotateSegments(blockedSegments, direction), 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 48, 0x20); }