diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp index 645f2de972..906431e06d 100644 --- a/src/openrct2/paint/support/WoodenSupports.cpp +++ b/src/openrct2/paint/support/WoodenSupports.cpp @@ -36,7 +36,7 @@ struct SupportsIdDescriptor /* 0x0097B1C4 */ static constexpr SupportsIdDescriptor WoodenSupportImageIds[kNumWoodenSupportTypes][kNumWoodenSupportSubTypes] = { - // WoodenSupportType::Truss + // WoodenSupportType::truss { { 3392, 3393, 3394, 3536 }, // WoodenSupportSubType::NeSw { 3390, 3391, 3394, 3514 }, // WoodenSupportSubType::NwSe @@ -45,7 +45,7 @@ static constexpr SupportsIdDescriptor WoodenSupportImageIds[kNumWoodenSupportTyp { 3564, 3565, 3566, 3614 }, // WoodenSupportSubType::Corner2 { 3567, 3568, 3569, 3636 }, // WoodenSupportSubType::Corner3 }, - // WoodenSupportType::Mine + // WoodenSupportType::mine { { 3677, 3678, 3680, 3739 }, // WoodenSupportSubType::NeSw { 3675, 3676, 3679, 3717 }, // WoodenSupportSubType::NwSe @@ -130,7 +130,7 @@ static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds1 = { { // clang-format off /* 0x0097B224 */ static constexpr const ImagesByTransitionTypeArray::const_pointer WoodenCurveSupportImageIds[kNumWoodenSupportTypes][kNumWoodenSupportSubTypes] = { - // WoodenSupportType::Truss + // WoodenSupportType::truss { WoodenCurveSupportImageIds0.data(), // WoodenSupportSubType::NeSw WoodenCurveSupportImageIds0.data(), // WoodenSupportSubType::NwSe @@ -139,7 +139,7 @@ static constexpr const ImagesByTransitionTypeArray::const_pointer WoodenCurveSup nullptr, // WoodenSupportSubType::Corner2 nullptr, // WoodenSupportSubType::Corner3 }, - // WoodenSupportType::Mine + // WoodenSupportType::mine { WoodenCurveSupportImageIds1.data(), // WoodenSupportSubType::NeSw WoodenCurveSupportImageIds1.data(), // WoodenSupportSubType::NwSe diff --git a/src/openrct2/paint/support/WoodenSupports.h b/src/openrct2/paint/support/WoodenSupports.h index 62aa479a66..7d0480ea8a 100644 --- a/src/openrct2/paint/support/WoodenSupports.h +++ b/src/openrct2/paint/support/WoodenSupports.h @@ -21,8 +21,8 @@ namespace OpenRCT2 enum class WoodenSupportType : uint8_t { - Truss = 0, - Mine = 1, + truss = 0, + mine = 1, }; enum class WoodenSupportSubType : uint8_t diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 639219bf6d..cfccdd5e15 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -213,7 +213,7 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3 supportsImageTemplate = ImageId().WithPrimary(COLOUR_SATURATED_BROWN); } WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, supportsImageTemplate); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, supportsImageTemplate); height += isExit ? 40 : 56; PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); @@ -342,7 +342,7 @@ static void PaintParkEntrance(PaintSession& session, uint8_t direction, int32_t supportsImageTemplate = ImageId().WithPrimary(COLOUR_SATURATED_BROWN); } WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, supportsImageTemplate); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, supportsImageTemplate); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + 80); diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index c06daa7cc1..d6a270b0e7 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -76,7 +76,7 @@ static void PaintLargeScenerySupports( } WoodenBSupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, supportHeight, imageTemplate, transitionType); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, supportHeight, imageTemplate, transitionType); int32_t clearanceHeight = ceil2(tileElement.GetClearanceZ() + 15, 16); if (tile.allowSupportsAbove) diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 7f750fd5fd..57c67f47d0 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -65,7 +65,7 @@ static void PaintSmallScenerySupports( } WoodenBSupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, supportHeight, supportImageTemplate, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, supportHeight, supportImageTemplate, transitionType); } diff --git a/src/openrct2/paint/track/gentle/CarRide.cpp b/src/openrct2/paint/track/gentle/CarRide.cpp index 2fd014ff5f..dcc0193a37 100644 --- a/src/openrct2/paint/track/gentle/CarRide.cpp +++ b/src/openrct2/paint/track/gentle/CarRide.cpp @@ -486,7 +486,7 @@ static void PaintCarRideTrackSpinningTunnel( } WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); diff --git a/src/openrct2/paint/track/gentle/Circus.cpp b/src/openrct2/paint/track/gentle/Circus.cpp index ab66f8d975..4871c8f82b 100644 --- a/src/openrct2/paint/track/gentle/Circus.cpp +++ b/src/openrct2/paint/track/gentle/Circus.cpp @@ -60,7 +60,7 @@ static void PaintCircus( int32_t edges = kEdges3x3[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/CrookedHouse.cpp b/src/openrct2/paint/track/gentle/CrookedHouse.cpp index 2b4e9318d3..7939b197ef 100644 --- a/src/openrct2/paint/track/gentle/CrookedHouse.cpp +++ b/src/openrct2/paint/track/gentle/CrookedHouse.cpp @@ -95,7 +95,7 @@ static void PaintCrookedHouse( int32_t edges = kEdges3x3[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/Dodgems.cpp b/src/openrct2/paint/track/gentle/Dodgems.cpp index 707b5765ca..e8b1bf7cea 100644 --- a/src/openrct2/paint/track/gentle/Dodgems.cpp +++ b/src/openrct2/paint/track/gentle/Dodgems.cpp @@ -55,7 +55,7 @@ static void PaintDodgems( int32_t edges = kEdges4x4[relativeTrackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/FerrisWheel.cpp b/src/openrct2/paint/track/gentle/FerrisWheel.cpp index 52df885dde..c0bc18d55b 100644 --- a/src/openrct2/paint/track/gentle/FerrisWheel.cpp +++ b/src/openrct2/paint/track/gentle/FerrisWheel.cpp @@ -122,7 +122,7 @@ static void PaintFerrisWheel( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/FlyingSaucers.cpp b/src/openrct2/paint/track/gentle/FlyingSaucers.cpp index 614a16868b..0cba8d97de 100644 --- a/src/openrct2/paint/track/gentle/FlyingSaucers.cpp +++ b/src/openrct2/paint/track/gentle/FlyingSaucers.cpp @@ -47,7 +47,7 @@ static void PaintFlyingSaucers( int32_t edges = kEdges4x4[relativeTrackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/GhostTrain.cpp b/src/openrct2/paint/track/gentle/GhostTrain.cpp index 28248286ad..202c9a79f2 100644 --- a/src/openrct2/paint/track/gentle/GhostTrain.cpp +++ b/src/openrct2/paint/track/gentle/GhostTrain.cpp @@ -545,7 +545,7 @@ static void PaintGhostTrainTrackSpinningTunnel( PaintUtilPushTunnelRotated(session, direction, height, tunnelImage); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); diff --git a/src/openrct2/paint/track/gentle/Maze.cpp b/src/openrct2/paint/track/gentle/Maze.cpp index 33b5848c3a..151712eea3 100644 --- a/src/openrct2/paint/track/gentle/Maze.cpp +++ b/src/openrct2/paint/track/gentle/Maze.cpp @@ -66,7 +66,7 @@ static void MazePaintSetup( PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 0 }); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NwSe, rotation, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NwSe, rotation, height, GetShopSupportColourScheme(session, trackElement)); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll & ~EnumToFlag(PaintSegment::centre), 0xFFFF, 0); diff --git a/src/openrct2/paint/track/gentle/MerryGoRound.cpp b/src/openrct2/paint/track/gentle/MerryGoRound.cpp index 3f4a7b95ae..60a60d2e18 100644 --- a/src/openrct2/paint/track/gentle/MerryGoRound.cpp +++ b/src/openrct2/paint/track/gentle/MerryGoRound.cpp @@ -114,7 +114,7 @@ static void PaintMerryGoRound( int32_t edges = kEdges3x3[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/MiniGolf.cpp b/src/openrct2/paint/track/gentle/MiniGolf.cpp index 71e8d5d3ec..545e790c63 100644 --- a/src/openrct2/paint/track/gentle/MiniGolf.cpp +++ b/src/openrct2/paint/track/gentle/MiniGolf.cpp @@ -747,7 +747,7 @@ static void PaintMiniGolfStation( TrackPaintUtilDrawStationTunnel(session, direction, height); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); @@ -852,7 +852,7 @@ static void PaintMiniGolfHoleAb( CoordsXY boundBox, boundBoxOffset; bool drewSupports = WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); @@ -925,7 +925,7 @@ static void PaintMiniGolfHoleC( CoordsXY boundBox, boundBoxOffset; bool drewSupports = WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); PaintUtilSetGeneralSupportHeight(session, height + kDefaultGeneralSupportHeight); @@ -993,7 +993,7 @@ static void PaintMiniGolfHoleD( if (trackSequence == 2) supportSubType = (direction & 1) ? WoodenSupportSubType::NeSw : WoodenSupportSubType::NwSe; const bool drewSupports = WoodenASupportsPaintSetup( - session, WoodenSupportType::Truss, supportSubType, height, session.SupportColours); + session, WoodenSupportType::truss, supportSubType, height, session.SupportColours); auto boundBox = kMiniGolfTrackBoundingBoxesHoleD[direction][trackSequence]; boundBox.offset.z += height; @@ -1043,7 +1043,7 @@ static void PaintMiniGolfHoleE( if (trackSequence == 2) supportSubType = (direction & 1) ? WoodenSupportSubType::NeSw : WoodenSupportSubType::NwSe; const bool drewSupports = WoodenASupportsPaintSetup( - session, WoodenSupportType::Truss, supportSubType, height, session.SupportColours); + session, WoodenSupportType::truss, supportSubType, height, session.SupportColours); auto boundBox = kMiniGolfTrackBoundingBoxesHoleE[direction][trackSequence]; boundBox.offset.z += height; diff --git a/src/openrct2/paint/track/gentle/MiniHelicopters.cpp b/src/openrct2/paint/track/gentle/MiniHelicopters.cpp index 112ffd7599..1e47de45c2 100644 --- a/src/openrct2/paint/track/gentle/MiniHelicopters.cpp +++ b/src/openrct2/paint/track/gentle/MiniHelicopters.cpp @@ -356,7 +356,7 @@ static void PaintMiniHelicoptersTrackSpinningTunnel( PaintUtilPushTunnelRotated(session, direction, height, kTunnelGroup, TunnelSubType::Flat); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); PaintUtilSetSegmentSupportHeight(session, kSegmentsAll, 0xFFFF, 0); diff --git a/src/openrct2/paint/track/gentle/ObservationTower.cpp b/src/openrct2/paint/track/gentle/ObservationTower.cpp index b259899a69..41663ec216 100644 --- a/src/openrct2/paint/track/gentle/ObservationTower.cpp +++ b/src/openrct2/paint/track/gentle/ObservationTower.cpp @@ -43,7 +43,7 @@ static void PaintObservationTowerBase( CoordsXY position = session.MapPosition; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/gentle/SpiralSlide.cpp b/src/openrct2/paint/track/gentle/SpiralSlide.cpp index c06f455787..0a003942f7 100644 --- a/src/openrct2/paint/track/gentle/SpiralSlide.cpp +++ b/src/openrct2/paint/track/gentle/SpiralSlide.cpp @@ -209,7 +209,7 @@ static void PaintSpiralSlide( int32_t edges = kEdges2x2[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); // Base diff --git a/src/openrct2/paint/track/thrill/3dCinema.cpp b/src/openrct2/paint/track/thrill/3dCinema.cpp index 98b85058d1..ed664faf9b 100644 --- a/src/openrct2/paint/track/thrill/3dCinema.cpp +++ b/src/openrct2/paint/track/thrill/3dCinema.cpp @@ -62,7 +62,7 @@ static void Paint3dCinema( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/Enterprise.cpp b/src/openrct2/paint/track/thrill/Enterprise.cpp index 9c3c3d6a6b..48265cf109 100644 --- a/src/openrct2/paint/track/thrill/Enterprise.cpp +++ b/src/openrct2/paint/track/thrill/Enterprise.cpp @@ -101,7 +101,7 @@ static void PaintEnterprise( int32_t edges = kEdges4x4[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/LaunchedFreefall.cpp b/src/openrct2/paint/track/thrill/LaunchedFreefall.cpp index 1e95d74d30..d7fb5e31b5 100644 --- a/src/openrct2/paint/track/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/paint/track/thrill/LaunchedFreefall.cpp @@ -41,7 +41,7 @@ static void PaintLaunchedFreefallBase( int32_t edges = kEdges3x3[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/MotionSimulator.cpp b/src/openrct2/paint/track/thrill/MotionSimulator.cpp index b1ea751351..5ac1942a37 100644 --- a/src/openrct2/paint/track/thrill/MotionSimulator.cpp +++ b/src/openrct2/paint/track/thrill/MotionSimulator.cpp @@ -114,7 +114,7 @@ static void PaintMotionSimulator( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/RotoDrop.cpp b/src/openrct2/paint/track/thrill/RotoDrop.cpp index 493ca6d688..3fcb9743fd 100644 --- a/src/openrct2/paint/track/thrill/RotoDrop.cpp +++ b/src/openrct2/paint/track/thrill/RotoDrop.cpp @@ -45,7 +45,7 @@ static void PaintRotoDropBase( int32_t edges = kEdges3x3[trackSequence]; WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/SwingingShip.cpp b/src/openrct2/paint/track/thrill/SwingingShip.cpp index de95caff02..921cd17783 100644 --- a/src/openrct2/paint/track/thrill/SwingingShip.cpp +++ b/src/openrct2/paint/track/thrill/SwingingShip.cpp @@ -167,7 +167,7 @@ static void PaintSwingingShip( if (relativeTrackSequence == 1 || relativeTrackSequence == 4) { WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, session.SupportColours); } else { diff --git a/src/openrct2/paint/track/thrill/TopSpin.cpp b/src/openrct2/paint/track/thrill/TopSpin.cpp index 922ef22737..03bb855ff1 100644 --- a/src/openrct2/paint/track/thrill/TopSpin.cpp +++ b/src/openrct2/paint/track/thrill/TopSpin.cpp @@ -191,7 +191,7 @@ static void PaintTopSpin( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.getStationObject(); diff --git a/src/openrct2/paint/track/thrill/Twist.cpp b/src/openrct2/paint/track/thrill/Twist.cpp index 0615444006..00b0e0226f 100644 --- a/src/openrct2/paint/track/thrill/Twist.cpp +++ b/src/openrct2/paint/track/thrill/Twist.cpp @@ -96,7 +96,7 @@ static void PaintTwist( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); const StationObject* stationObject = ride.getStationObject(); TrackPaintUtilPaintFloor(session, edges, stationColour, height, kFloorSpritesCork, stationObject); diff --git a/src/openrct2/paint/track/transport/Chairlift.cpp b/src/openrct2/paint/track/transport/Chairlift.cpp index 63c8a41ab8..8450fac164 100644 --- a/src/openrct2/paint/track/transport/Chairlift.cpp +++ b/src/openrct2/paint/track/transport/Chairlift.cpp @@ -203,7 +203,7 @@ static void ChairliftPaintStationNeSw( const auto* stationObj = ride.getStationObject(); auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, stationColour); + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, stationColour); if (!isStart && !isEnd) { @@ -295,7 +295,7 @@ static void ChairliftPaintStationSeNw( auto stationColour = GetStationColourScheme(session, trackElement); WoodenASupportsPaintSetupRotated( - session, WoodenSupportType::Truss, WoodenSupportSubType::NeSw, direction, height, + session, WoodenSupportType::truss, WoodenSupportSubType::NeSw, direction, height, GetStationColourScheme(session, trackElement)); if (!isStart && !isEnd) diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index d9fdfd9f3d..dfdcc3a2c2 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::airPoweredVerticalCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHillSteep, TrackGroup::liftHillCurve, TrackGroup::flatRollBanking, TrackGroup::curve, TrackGroup::brakes, TrackGroup::reverseFreefall, TrackGroup::slopeToFlat, TrackGroup::onridePhoto}, .extraTrackGroups = {TrackGroup::booster}, }), diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index 74146d8c58..e254f4c9dd 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::classicWoodenRollerCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::verticalLoop, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::waterSplash, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeSteepLong, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge}, .extraTrackGroups = {TrackGroup::booster, TrackGroup::slopeCurveSteep}, }), diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h index cb3543e6f7..efd3a17d2d 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::classicWoodenTwisterRollerCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = { TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeSteepLong, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::slopeCurveSteep, TrackGroup::slopeCurveBanked }, .extraTrackGroups = { TrackGroup::verticalLoop, TrackGroup::waterSplash, TrackGroup::booster, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge }, }), diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index c3e846e95c..623eb57821 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::heartlineTwisterCoaster, - .supportType = WoodenSupportType::Mine, + .supportType = WoodenSupportType::mine, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::heartlineRoll, TrackGroup::heartlineTransfer}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index 93ca86a9ef..379527eb8d 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::hybridCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::barrelRoll, TrackGroup::poweredLift, TrackGroup::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeSteepLong, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge, TrackGroup::slopeCurveLarge, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::inclinedBrakes }, .extraTrackGroups = {TrackGroup::booster}, }), diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index 0bbc3c475b..d032929678 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::mineTrainCoaster, - .supportType = WoodenSupportType::Mine, + .supportType = WoodenSupportType::mine, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeSteepLong}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index ea02a69370..b9618a18a5 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::reverseFreefallCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHillSteep, TrackGroup::reverseFreefall, TrackGroup::onridePhoto}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h index 740abe57ba..8f4708686b 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::reverserRollerCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::brakes, TrackGroup::reverser}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h index 520b3c9357..a5b3bdd731 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::sideFrictionRollerCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::brakes, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index 98b19d9a4d..93bdf1bc89 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::virginiaReel, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::curveSmall}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h index 1edc7d0ea5..463ac401aa 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -32,7 +32,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD = }, { .trackStyle = TrackStyle::splashBoats, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::curve, TrackGroup::sBend }, .extraTrackGroups = {}, .icon = SPR_RIDE_CONSTRUCTION_WATER_CHANNEL, diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index 867bd76975..fccf49db23 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::woodenRollerCoaster, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::verticalLoop, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::waterSplash, TrackGroup::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeSteepLong, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge}, .extraTrackGroups = {TrackGroup::booster}, }), diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h index 88bc46a803..0bc1d5cb72 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::woodenWildMouse, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::flatToSteepSlope, TrackGroup::curveVerySmall, TrackGroup::curveSmall}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index 7dc304daf7..6e2ddb3a77 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor GoKartsRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::goKarts, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::slopeCurve, TrackGroup::slopeCurveLarge, TrackGroup::sBend}, .extraTrackGroups = {TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeSteepLong}, }), diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index f933dd57a8..5d93978d83 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::miniatureRailway, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index 63c51eca53..a712e2a9e7 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor RiverRaftsRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::splashBoats, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::sBend, TrackGroup::curve}, .extraTrackGroups = {TrackGroup::slope, TrackGroup::slopeSteepDown, TrackGroup::onridePhoto}, }), diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index fc5e8cce78..22cf251776 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::riverRapids, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::onridePhoto, TrackGroup::rapids, TrackGroup::waterfall, TrackGroup::whirlpool}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index d769885651..cf91f24d1b 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ .trackStyle = TrackStyle::splashBoats, - .supportType = WoodenSupportType::Truss, + .supportType = WoodenSupportType::truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::slopeSteepDown, TrackGroup::sBend, TrackGroup::curve, TrackGroup::onridePhoto}, .extraTrackGroups = {}, }),