From 38737f0e6ffe2ebb54a113011cbcd2c3ddb1a47d Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 2 Dec 2024 20:10:34 +0100 Subject: [PATCH] Number track styles --- src/openrct2/libopenrct2.vcxproj | 4 +- src/openrct2/ride/RideData.h | 4 +- src/openrct2/ride/TrackPaint.cpp | 5 +- src/openrct2/ride/TrackStyle.cpp | 105 ++++++++++++++++++ src/openrct2/ride/TrackStyle.h | 103 +++++++++++++++++ .../rtd/coaster/AirPoweredVerticalCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/AlpineCoaster.h | 2 +- .../ride/rtd/coaster/BobsleighCoaster.h | 2 +- .../rtd/coaster/ClassicMiniRollerCoaster.h | 2 +- .../rtd/coaster/ClassicStandUpRollerCoaster.h | 2 +- .../rtd/coaster/ClassicWoodenRollerCoaster.h | 2 +- .../ClassicWoodenTwisterRollerCoaster.h | 2 +- .../ride/rtd/coaster/CompactInvertedCoaster.h | 2 +- .../ride/rtd/coaster/CorkscrewRollerCoaster.h | 2 +- .../ride/rtd/coaster/FlyingRollerCoaster.h | 8 +- src/openrct2/ride/rtd/coaster/GigaCoaster.h | 2 +- .../rtd/coaster/HeartlineTwisterCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/HybridCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/HyperTwister.h | 2 +- src/openrct2/ride/rtd/coaster/Hypercoaster.h | 2 +- .../ride/rtd/coaster/InvertedHairpinCoaster.h | 2 +- .../ride/rtd/coaster/InvertedImpulseCoaster.h | 2 +- .../ride/rtd/coaster/InvertedRollerCoaster.h | 2 +- .../ride/rtd/coaster/JuniorRollerCoaster.h | 2 +- .../rtd/coaster/LIMLaunchedRollerCoaster.h | 2 +- .../rtd/coaster/LSMLaunchedRollerCoaster.h | 2 +- .../ride/rtd/coaster/LayDownRollerCoaster.h | 8 +- .../ride/rtd/coaster/LoopingRollerCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/MineRide.h | 2 +- .../ride/rtd/coaster/MineTrainCoaster.h | 2 +- .../ride/rtd/coaster/MiniRollerCoaster.h | 2 +- .../ride/rtd/coaster/MiniSuspendedCoaster.h | 2 +- .../rtd/coaster/MultiDimensionRollerCoaster.h | 8 +- .../ride/rtd/coaster/ReverseFreefallCoaster.h | 2 +- .../ride/rtd/coaster/ReverserRollerCoaster.h | 2 +- .../rtd/coaster/SideFrictionRollerCoaster.h | 2 +- .../rtd/coaster/SingleRailRollerCoaster.h | 2 +- .../ride/rtd/coaster/SpinningWildMouse.h | 2 +- .../ride/rtd/coaster/SpiralRollerCoaster.h | 2 +- .../ride/rtd/coaster/StandUpRollerCoaster.h | 2 +- .../ride/rtd/coaster/SteelWildMouse.h | 2 +- src/openrct2/ride/rtd/coaster/Steeplechase.h | 2 +- .../rtd/coaster/SuspendedSwingingCoaster.h | 2 +- .../ride/rtd/coaster/TwisterRollerCoaster.h | 2 +- .../ride/rtd/coaster/VerticalDropCoaster.h | 2 +- src/openrct2/ride/rtd/coaster/VirginiaReel.h | 2 +- src/openrct2/ride/rtd/coaster/WaterCoaster.h | 4 +- .../ride/rtd/coaster/WoodenRollerCoaster.h | 2 +- .../ride/rtd/coaster/WoodenWildMouse.h | 2 +- src/openrct2/ride/rtd/gentle/CarRide.h | 2 +- src/openrct2/ride/rtd/gentle/Circus.h | 2 +- src/openrct2/ride/rtd/gentle/CrookedHouse.h | 2 +- src/openrct2/ride/rtd/gentle/Dodgems.h | 2 +- src/openrct2/ride/rtd/gentle/FerrisWheel.h | 2 +- src/openrct2/ride/rtd/gentle/FlyingSaucers.h | 2 +- src/openrct2/ride/rtd/gentle/GhostTrain.h | 2 +- src/openrct2/ride/rtd/gentle/HauntedHouse.h | 2 +- src/openrct2/ride/rtd/gentle/Maze.h | 2 +- src/openrct2/ride/rtd/gentle/MerryGoRound.h | 2 +- src/openrct2/ride/rtd/gentle/MiniGolf.h | 2 +- .../ride/rtd/gentle/MiniHelicopters.h | 2 +- src/openrct2/ride/rtd/gentle/MonorailCycles.h | 2 +- src/openrct2/ride/rtd/gentle/MonsterTrucks.h | 2 +- .../ride/rtd/gentle/ObservationTower.h | 2 +- src/openrct2/ride/rtd/gentle/SpaceRings.h | 2 +- src/openrct2/ride/rtd/gentle/SpiralSlide.h | 2 +- src/openrct2/ride/rtd/shops/CashMachine.h | 2 +- src/openrct2/ride/rtd/shops/DrinkStall.h | 2 +- src/openrct2/ride/rtd/shops/FirstAid.h | 2 +- src/openrct2/ride/rtd/shops/FoodStall.h | 2 +- .../ride/rtd/shops/InformationKiosk.h | 2 +- src/openrct2/ride/rtd/shops/Shop.h | 2 +- src/openrct2/ride/rtd/shops/Toilets.h | 2 +- src/openrct2/ride/rtd/thrill/3DCinema.h | 2 +- src/openrct2/ride/rtd/thrill/Enterprise.h | 2 +- src/openrct2/ride/rtd/thrill/GoKarts.h | 2 +- .../ride/rtd/thrill/LaunchedFreefall.h | 2 +- src/openrct2/ride/rtd/thrill/MagicCarpet.h | 2 +- .../ride/rtd/thrill/MotionSimulator.h | 2 +- src/openrct2/ride/rtd/thrill/RotoDrop.h | 2 +- .../ride/rtd/thrill/SwingingInverterShip.h | 2 +- src/openrct2/ride/rtd/thrill/SwingingShip.h | 2 +- src/openrct2/ride/rtd/thrill/TopSpin.h | 2 +- src/openrct2/ride/rtd/thrill/Twist.h | 2 +- src/openrct2/ride/rtd/transport/Chairlift.h | 2 +- src/openrct2/ride/rtd/transport/Lift.h | 2 +- .../ride/rtd/transport/MiniatureRailway.h | 2 +- src/openrct2/ride/rtd/transport/Monorail.h | 2 +- .../ride/rtd/transport/SuspendedMonorail.h | 2 +- src/openrct2/ride/rtd/water/BoatHire.h | 2 +- src/openrct2/ride/rtd/water/DinghySlide.h | 4 +- src/openrct2/ride/rtd/water/LogFlume.h | 2 +- src/openrct2/ride/rtd/water/RiverRafts.h | 2 +- src/openrct2/ride/rtd/water/RiverRapids.h | 2 +- src/openrct2/ride/rtd/water/SplashBoats.h | 2 +- src/openrct2/ride/rtd/water/SubmarineRide.h | 2 +- 96 files changed, 318 insertions(+), 107 deletions(-) create mode 100644 src/openrct2/ride/TrackStyle.cpp create mode 100644 src/openrct2/ride/TrackStyle.h diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 36a6b77798f2..70095ee36f6c 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -527,6 +527,7 @@ + @@ -1047,6 +1048,7 @@ + @@ -1133,4 +1135,4 @@ - \ No newline at end of file + diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index ba133232ba7b..515c5cac8375 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -34,7 +34,7 @@ #include "RideStringIds.h" #include "ShopItem.h" #include "Track.h" -#include "TrackPaint.h" +#include "TrackStyle.h" #include "Vehicle.h" enum class ResearchCategory : uint8_t; @@ -288,7 +288,7 @@ enum class RideConstructionWindowContext : uint8_t struct TrackDrawerEntry { - TRACK_PAINT_FUNCTION_GETTER Drawer = nullptr; + TrackStyle trackStyle = TrackStyle::null; SupportType supportType{}; /** rct2: 0x0097C468 (0 - 31) and 0x0097C5D4 (32 - 63) */ RideTrackGroups enabledTrackGroups{}; diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index f8e66b6bff50..e3a68be489ba 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -34,6 +34,7 @@ #include "Station.h" #include "TrackData.h" #include "TrackDesign.h" +#include "TrackStyle.h" using namespace OpenRCT2; using namespace OpenRCT2::TrackMetaData; @@ -2009,10 +2010,10 @@ void PaintTrack(PaintSession& session, Direction direction, int32_t height, cons bool isInverted = trackElement.IsInverted() && rtd.HasFlag(RtdFlag::hasInvertedVariant); const auto trackDrawerEntry = getTrackDrawerEntry(rtd, isInverted, TrackElementIsCovered(trackType)); - if (trackDrawerEntry.Drawer != nullptr) + if (trackDrawerEntry.trackStyle != TrackStyle::null) { trackType = UncoverTrackElement(trackType); - TRACK_PAINT_FUNCTION paintFunction = trackDrawerEntry.Drawer(trackType); + TRACK_PAINT_FUNCTION paintFunction = GetTrackPaintFunction(trackDrawerEntry.trackStyle, trackType); if (paintFunction != nullptr) { paintFunction(session, *ride, trackSequence, direction, height, trackElement, trackDrawerEntry.supportType); diff --git a/src/openrct2/ride/TrackStyle.cpp b/src/openrct2/ride/TrackStyle.cpp new file mode 100644 index 000000000000..67c893ecf046 --- /dev/null +++ b/src/openrct2/ride/TrackStyle.cpp @@ -0,0 +1,105 @@ +/***************************************************************************** + * Copyright (c) 2014-2024 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#include "TrackStyle.h" + +#include "TrackPaint.h" + +static constexpr TRACK_PAINT_FUNCTION_GETTER kPaintFunctionMap[] = { + GetTrackPaintFunction3dCinema, // _3DCinema + GetTrackPaintFunctionAirPoweredVerticalRC, // airPoweredVerticalCoaster + OpenRCT2::AlpineRC::GetTrackPaintFunction, // alpineCoaster + GetTrackPaintFunctionBoatHire, // boatHire + GetTrackPaintFunctionBobsleighRC, // bobsleighCoaster + GetTrackPaintFunctionCarRide, // carRide + GetTrackPaintFunctionChairlift, // chairlift + GetTrackPaintFunctionCircus, // circus + GetTrackPaintFunctionClassicStandUpRC, // classicStandUpRollerCoaster + GetTrackPaintFunctionClassicWoodenRC, // classicWoodenRollerCoaster + GetTrackPaintFunctionClassicWoodenTwisterRC, // classicWoodenTwisterRollerCoaster + GetTrackPaintFunctionCompactInvertedRC, // compactInvertedCoaster + GetTrackPaintFunctionCorkscrewRC, // corkscrewRollerCoaster + GetTrackPaintFunctionCrookedHouse, // crookedHouse + GetTrackPaintFunctionDinghySlide, // dinghySlide + GetTrackPaintFunctionDinghySlideCovered, // dinghySlideCovered + GetTrackPaintFunctionDodgems, // dodgems + GetTrackPaintFunctionEnterprise, // enterprise + GetTrackPaintFunctionFacility, // facility + GetTrackPaintFunctionFerrisWheel, // ferrisWheel + GetTrackPaintFunctionFlyingRC, // flyingRollerCoaster + GetTrackPaintFunctionFlyingRCInverted, // flyingRollerCoasterInverted + GetTrackPaintFunctionFlyingSaucers, // flyingSaucers + GetTrackPaintFunctionGhostTrain, // ghostTrain + GetTrackPaintFunctionGoKarts, // goKarts + GetTrackPaintFunctionHauntedHouse, // hauntedHouse + GetTrackPaintFunctionHeartlineTwisterRC, // heartlineTwisterCoaster + OpenRCT2::HybridRC::GetTrackPaintFunction, // hybridCoaster + GetTrackPaintFunctionInvertedHairpinRC, // invertedHairpinCoaster + GetTrackPaintFunctionInvertedImpulseRC, // invertedImpulseCoaster + GetTrackPaintFunctionInvertedRC, // invertedRollerCoaster + GetTrackPaintFunctionJuniorRC, // juniorRollerCoaster + GetTrackPaintFunctionLatticeTriangleTrack, // latticeTriangle + GetTrackPaintFunctionLatticeTriangleTrackAlt, // latticeTriangleAlt + GetTrackPaintFunctionLaunchedFreefall, // launchedFreefall + GetTrackPaintFunctionLayDownRCInverted, // layDownRollerCoasterInverted + GetTrackPaintFunctionLift, // lift + GetTrackPaintFunctionLimLaunchedRC, // limLaunchedRollerCoaster + GetTrackPaintFunctionLogFlume, // logFlume + GetTrackPaintFunctionLoopingRC, // loopingRollerCoaster + GetTrackPaintFunctionMagicCarpet, // magicCarpet + GetTrackPaintFunctionMaze, // maze + GetTrackPaintFunctionMerryGoRound, // merryGoRound + GetTrackPaintFunctionMineRide, // mineRide + GetTrackPaintFunctionMineTrainRC, // mineTrainCoaster + GetTrackPaintFunctionMiniGolf, // miniGolf + GetTrackPaintFunctionMiniHelicopters, // miniHelicopters + GetTrackPaintFunctionMiniRC, // miniRollerCoaster + GetTrackPaintFunctionMiniSuspendedRC, // miniSuspendedCoaster + GetTrackPaintFunctionMiniatureRailway, // miniatureRailway + GetTrackPaintFunctionMonorail, // monorail + GetTrackPaintFunctionMonorailCycles, // monorailCycles + GetTrackPaintFunctionMotionsimulator, // motionSimulator + GetTrackPaintFunctionMultiDimensionRC, // multiDimensionRollerCoaster + GetTrackPaintFunctionMultiDimensionRC, // multiDimensionRollerCoasterInverted + GetTrackPaintFunctionObservationTower, // observationTower + GetTrackPaintFunctionReverseFreefallRC, // reverseFreefallCoaster + GetTrackPaintFunctionReverserRC, // reverserRollerCoaster + GetTrackPaintFunctionRiverRapids, // riverRapids + GetTrackPaintFunctionRotoDrop, // rotoDrop + GetTrackPaintFunctionShop, // shop + GetTrackPaintFunctionSideFrictionRC, // sideFrictionRollerCoaster + OpenRCT2::SingleRailRC::GetTrackPaintFunction, // singleRailRollerCoaster + GetTrackPaintFunctionSpaceRings, // spaceRings + GetTrackPaintFunctionSpiralSlide, // spiralSlide + GetTrackPaintFunctionSplashBoats, // splashBoats + GetTrackPaintFunctionStandUpRC, // standUpRollerCoaster + GetTrackPaintFunctionWildMouse, // steelWildMouse + GetTrackPaintFunctionSteeplechase, // steeplechase + GetTrackPaintFunctionSubmarineRide, // submarineRide + GetTrackPaintFunctionSuspendedMonorail, // suspendedMonorail + GetTrackPaintFunctionSuspendedSwingingRC, // suspendedSwingingCoaster + GetTrackPaintFunctionSwingingInverterShip, // swingingInverterShip + GetTrackPaintFunctionSwingingShip, // swingingShip + GetTrackPaintFunctionTopspin, // topSpin + GetTrackPaintFunctionTwist, // twist + GetTrackPaintFunctionTwisterRC, // twisterRollerCoaster + GetTrackPaintFunctionVirginiaReel, // virginiaReel + GetTrackPaintFunctionWaterRC, // waterCoaster + GetTrackPaintFunctionWoodenRC, // woodenRollerCoaster + GetTrackPaintFunctionWoodenWildMouse, // woodenWildMouse +}; + +TRACK_PAINT_FUNCTION GetTrackPaintFunction(TrackStyle trackStyle, OpenRCT2::TrackElemType trackType) +{ + auto cast = static_cast(trackStyle); + if (cast >= std::size(kPaintFunctionMap)) + return nullptr; + + return kPaintFunctionMap[cast](trackType); +} diff --git a/src/openrct2/ride/TrackStyle.h b/src/openrct2/ride/TrackStyle.h new file mode 100644 index 000000000000..4a10406d5651 --- /dev/null +++ b/src/openrct2/ride/TrackStyle.h @@ -0,0 +1,103 @@ +/***************************************************************************** + * Copyright (c) 2014-2024 OpenRCT2 developers + * + * For a complete list of all authors, please refer to contributors.md + * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is licensed under the GNU General Public License version 3. + *****************************************************************************/ + +#pragma once + +#include "TrackPaint.h" + +#include + +enum class TrackStyle : uint8_t +{ + _3DCinema, + airPoweredVerticalCoaster, + alpineCoaster, + boatHire, + bobsleighCoaster, + carRide, + chairlift, + circus, + classicStandUpRollerCoaster, + classicWoodenRollerCoaster, + classicWoodenTwisterRollerCoaster, + compactInvertedCoaster, + corkscrewRollerCoaster, + crookedHouse, + dinghySlide, + dinghySlideCovered, + dodgems, + enterprise, + facility, + ferrisWheel, + flyingRollerCoaster, + flyingRollerCoasterInverted, + flyingSaucers, + ghostTrain, + goKarts, + hauntedHouse, + heartlineTwisterCoaster, + hybridCoaster, + invertedHairpinCoaster, + invertedImpulseCoaster, + invertedRollerCoaster, + juniorRollerCoaster, + latticeTriangle, + latticeTriangleAlt, + launchedFreefall, + layDownRollerCoasterInverted, + lift, + limLaunchedRollerCoaster, + logFlume, + loopingRollerCoaster, + magicCarpet, + maze, + merryGoRound, + mineRide, + mineTrainCoaster, + miniGolf, + miniHelicopters, + miniRollerCoaster, + miniSuspendedCoaster, + miniatureRailway, + monorail, + monorailCycles, + motionSimulator, + multiDimensionRollerCoaster, + multiDimensionRollerCoasterInverted, + observationTower, + reverseFreefallCoaster, + reverserRollerCoaster, + riverRapids, + rotoDrop, + shop, + sideFrictionRollerCoaster, + singleRailRollerCoaster, + spaceRings, + spiralSlide, + splashBoats, + standUpRollerCoaster, + steelWildMouse, + steeplechase, + submarineRide, + suspendedMonorail, + suspendedSwingingCoaster, + swingingInverterShip, + swingingShip, + topSpin, + twist, + twisterRollerCoaster, + virginiaReel, + waterCoaster, + woodenRollerCoaster, + woodenWildMouse, + + null = 255, +}; + +TRACK_PAINT_FUNCTION GetTrackPaintFunction(TrackStyle trackStyle, OpenRCT2::TrackElemType trackType); diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index 32ab9e11d2ef..26ad8fa29fa0 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionAirPoweredVerticalRC, + .trackStyle = TrackStyle::airPoweredVerticalCoaster, .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/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index 2682f7469946..86e26739736c 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = OpenRCT2::AlpineRC::GetTrackPaintFunction, + .trackStyle = TrackStyle::alpineCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = { TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf}, .extraTrackGroups = {TrackGroup::helixUpBankedHalf}, diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h index fd8b2c670a7e..d906f1892db0 100644 --- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h +++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionBobsleighRC, + .trackStyle = TrackStyle::bobsleighCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve,TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes,TrackGroup::blockBrakes, TrackGroup::onridePhoto}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index 9724307f1757..1c27dc42c6ce 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionJuniorRC, + .trackStyle = TrackStyle::juniorRollerCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillCurve, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::blockBrakes, TrackGroup::booster, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::onridePhoto}, diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h index 6681a653ff63..1f1394998f26 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionClassicStandUpRC, + .trackStyle = TrackStyle::classicStandUpRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {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::halfLoop, TrackGroup::corkscrew, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index 15cbf798532d..66565355f44b 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionClassicWoodenRC, + .trackStyle = TrackStyle::classicWoodenRollerCoaster, .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 6e1101a05690..67d3f93ff482 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionClassicWoodenTwisterRC, + .trackStyle = TrackStyle::classicWoodenTwisterRollerCoaster, .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/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h index 493a6f8b2f02..0d4340abe812 100644 --- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCompactInvertedRC, + .trackStyle = TrackStyle::compactInvertedCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {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::twist, TrackGroup::halfLoop, TrackGroup::corkscrew, TrackGroup::helixDownBankedQuarter, TrackGroup::helixUpBankedQuarter, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h index f6605a4b7e95..36b32b7b6cb2 100644 --- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCorkscrewRC, + .trackStyle = TrackStyle::corkscrewRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {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::halfLoop, TrackGroup::corkscrew, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes,TrackGroup::booster, TrackGroup::slopeSteepLong, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeCurveBanked, TrackGroup::slopeCurveLarge, TrackGroup::corkscrewLarge, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge}, .extraTrackGroups = {TrackGroup::twist, TrackGroup::slopeVertical, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::barrelRoll, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge}, diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h index c3222863b0c2..b491b0b60987 100644 --- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h @@ -21,13 +21,13 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFlyingRC, + .trackStyle = TrackStyle::flyingRollerCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {TrackGroup::straight, 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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::inlineTwistUninverted, TrackGroup::flyingHalfLoopUninvertedUp, TrackGroup::quarterLoopUninvertedUp, TrackGroup::flyingLargeHalfLoopUninvertedUp, TrackGroup::slopeVertical, TrackGroup::slopeCurveBanked, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeCurveLarge}, .extraTrackGroups = {TrackGroup::booster, TrackGroup::slopeSteepLong, TrackGroup::flyingLargeHalfLoopUninvertedDown, TrackGroup::flyingHalfLoopUninvertedDown, TrackGroup::stationEnd, TrackGroup::verticalLoop, TrackGroup::poweredLift}, }), .InvertedTrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFlyingRCInverted, + .trackStyle = TrackStyle::flyingRollerCoasterInverted, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedQuarter, TrackGroup::helixUpBankedQuarter, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::inlineTwistInverted, TrackGroup::flyingHalfLoopInvertedDown, TrackGroup::quarterLoopInvertedDown, TrackGroup::flyingLargeHalfLoopInvertedDown, TrackGroup::booster, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::flyingLargeHalfLoopInvertedUp, TrackGroup::flyingHalfLoopInvertedUp}, @@ -99,12 +99,12 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = .Category = RIDE_CATEGORY_NONE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), .InvertedTrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index c098e28bd7eb..78608d7e3d47 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLatticeTriangleTrack, + .trackStyle = TrackStyle::latticeTriangle, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, 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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeSteepLong, TrackGroup::liftHillCable, TrackGroup::slopeCurveBanked, TrackGroup::slopeCurveLarge, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeVertical, TrackGroup::curveVertical}, .extraTrackGroups = {TrackGroup::barrelRoll, TrackGroup::quarterLoop, TrackGroup::halfLoop, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge, TrackGroup::verticalLoop, TrackGroup::corkscrew, TrackGroup::corkscrewLarge, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge, TrackGroup::booster, TrackGroup::diagBooster, TrackGroup::poweredLift}, diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index 020ddefb499d..7371c27bb1c2 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionHeartlineTwisterRC, + .trackStyle = TrackStyle::heartlineTwisterCoaster, .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 2b3cb147b159..e3594715aac7 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = OpenRCT2::HybridRC::GetTrackPaintFunction, + .trackStyle = TrackStyle::hybridCoaster, .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/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index 78497c07c77a..79a6b05e564e 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor HyperTwisterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionTwisterRC, + .trackStyle = TrackStyle::twisterRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = { TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, 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::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeSteepLong, TrackGroup::slopeVertical, TrackGroup::curveVertical, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeCurveLarge}, .extraTrackGroups = { TrackGroup::liftHillSteep, TrackGroup::brakeForDrop, TrackGroup::booster, TrackGroup::poweredLift }, diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index 255fe8a4b35c..0c59fb976511 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor HypercoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCorkscrewRC, + .trackStyle = TrackStyle::corkscrewRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, 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::blockBrakes, TrackGroup::slopeSteepLong, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeCurveBanked, TrackGroup::slopeCurveLarge}, .extraTrackGroups = {TrackGroup::verticalLoop, TrackGroup::halfLoop, TrackGroup::corkscrew, TrackGroup::booster}, diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h index 6b800a7752a3..b22119f2a0e3 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionInvertedHairpinRC, + .trackStyle = TrackStyle::invertedHairpinCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::brakes, TrackGroup::blockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h index 16aa3bbdb440..fc550bc70762 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionInvertedImpulseRC, + .trackStyle = TrackStyle::invertedImpulseCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeVertical, TrackGroup::curveVertical}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h index 8905fc4930a9..767d9fd0aec5 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionInvertedRC, + .trackStyle = TrackStyle::invertedRollerCoaster, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {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::twist, TrackGroup::halfLoop, TrackGroup::corkscrew, TrackGroup::helixDownBankedQuarter, TrackGroup::helixUpBankedQuarter, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::halfLoopLarge, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::booster}, diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h index 3b37d59a9aa5..226b19cb32b1 100644 --- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionJuniorRC, + .trackStyle = TrackStyle::juniorRollerCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill,TrackGroup::liftHillCurve, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::blockBrakes, TrackGroup::booster, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::onridePhoto}, diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h index ced016c7c427..337cb542b0fa 100644 --- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLimLaunchedRC, + .trackStyle = TrackStyle::limLaunchedRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::flatRollBanking, TrackGroup::verticalLoop, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::twist, TrackGroup::corkscrew, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::barrelRoll, TrackGroup::slopeCurveBanked, TrackGroup::slopeSteepLong, TrackGroup::halfLoop, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge, TrackGroup::corkscrewLarge}, .extraTrackGroups = {TrackGroup::flatToSteepSlope, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge}, diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h index a884e6e28ba0..8b984f9fee3d 100644 --- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLatticeTriangleTrackAlt, + .trackStyle = TrackStyle::latticeTriangleAlt, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, 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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeSteepLong, TrackGroup::slopeCurveBanked, TrackGroup::slopeCurveLarge, TrackGroup::slopeCurveLargeBanked, TrackGroup::booster, TrackGroup::diagBooster, TrackGroup::poweredLift, TrackGroup::slopeVertical, TrackGroup::curveVertical, TrackGroup::barrelRoll, TrackGroup::quarterLoop, TrackGroup::halfLoop, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge, TrackGroup::verticalLoop, TrackGroup::corkscrew, TrackGroup::corkscrewLarge, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge }, .extraTrackGroups = {TrackGroup::liftHill, TrackGroup::liftHillCable}, diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h index bfa128e60d46..43cdcef2a11d 100644 --- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { - .Drawer = GetTrackPaintFunctionCorkscrewRC, + .trackStyle = TrackStyle::corkscrewRollerCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = { 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::blockBrakes, TrackGroup::inlineTwistUninverted, TrackGroup::flyingHalfLoopUninvertedUp, TrackGroup::corkscrewUninverted, TrackGroup::slopeSteepLong, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeCurveBanked, TrackGroup::slopeCurveLarge }, .extraTrackGroups = { TrackGroup::flyingHalfLoopUninvertedDown, TrackGroup::booster }, @@ -29,7 +29,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = ), .InvertedTrackPaintFunctions = TrackDrawerDescriptor( { - .Drawer = GetTrackPaintFunctionLayDownRCInverted, + .trackStyle = TrackStyle::layDownRollerCoasterInverted, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedQuarter, TrackGroup::helixUpBankedQuarter, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::inlineTwistInverted, TrackGroup::flyingHalfLoopInvertedDown, TrackGroup::corkscrewInverted }, .extraTrackGroups = { TrackGroup::flyingHalfLoopInvertedUp, TrackGroup::stationEnd, TrackGroup::liftHill }, @@ -98,12 +98,12 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = .Category = RIDE_CATEGORY_NONE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), .InvertedTrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h index f7d0ed27cbdc..e84684e0f862 100644 --- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLoopingRC, + .trackStyle = TrackStyle::loopingRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::booster, TrackGroup::slopeCurveBanked, TrackGroup::slopeSteepLong, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::slopeVertical, TrackGroup::twist, TrackGroup::corkscrew, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::flatToSteepSlope, TrackGroup::barrelRoll, TrackGroup::halfLoop, TrackGroup::halfLoopMedium, TrackGroup::halfLoopLarge,TrackGroup::corkscrewLarge, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge}, diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h index 5418c4188bd0..1f256ac83490 100644 --- a/src/openrct2/ride/rtd/coaster/MineRide.h +++ b/src/openrct2/ride/rtd/coaster/MineRide.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MineRideRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMineRide, + .trackStyle = TrackStyle::mineRide, .supportType = MetalSupportType::Fork, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::onridePhoto}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index eda3c1d5d3ec..388053125fb0 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMineTrainRC, + .trackStyle = TrackStyle::mineTrainCoaster, .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/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h index 73606db05778..931d2f94b803 100644 --- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniRC, + .trackStyle = TrackStyle::miniRollerCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, 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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::liftHill}, .extraTrackGroups = {TrackGroup::booster, TrackGroup::liftHillCurved}, diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h index e69174d1fa80..0c19a7b4a2d1 100644 --- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniSuspendedRC, + .trackStyle = TrackStyle::miniSuspendedCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h index c3faf1c9a67c..f94ac7e86883 100644 --- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h @@ -20,13 +20,13 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMultiDimensionRC, + .trackStyle = TrackStyle::multiDimensionRollerCoaster, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::blockBrakes, TrackGroup::inlineTwistUninverted,TrackGroup::quarterLoopUninvertedUp, TrackGroup::quarterLoopUninvertedDown, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {}, }), .InvertedTrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMultiDimensionRC, + .trackStyle = TrackStyle::multiDimensionRollerCoasterInverted, .supportType = MetalSupportType::TubesInverted, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::blockBrakes, TrackGroup::inlineTwistInverted, TrackGroup::quarterLoopInvertedUp, TrackGroup::quarterLoopInvertedDown}, .extraTrackGroups = {}, @@ -98,12 +98,12 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = .Category = RIDE_CATEGORY_NONE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), .InvertedTrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = nullptr, + .trackStyle = TrackStyle::null, .enabledTrackGroups = { }, .extraTrackGroups = { }, }), diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index 1f662b5e3e68..352b654ed15a 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionReverseFreefallRC, + .trackStyle = TrackStyle::reverseFreefallCoaster, .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 3a0a12aa294f..14a4d0976621 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionReverserRC, + .trackStyle = TrackStyle::reverserRollerCoaster, .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 7e2355297763..36b34ae408f7 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSideFrictionRC, + .trackStyle = TrackStyle::sideFrictionRollerCoaster, .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/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index 735c561b0e0e..e481dbbca819 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = OpenRCT2::SingleRailRC::GetTrackPaintFunction, + .trackStyle = TrackStyle::singleRailRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = { TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::flatRollBanking, TrackGroup::slope, TrackGroup::flatToSteepSlope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::corkscrew, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::barrelRoll, TrackGroup::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::halfLoop, TrackGroup::halfLoopMedium, TrackGroup::corkscrewLarge, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge, TrackGroup::slopeCurveLarge, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::inclinedBrakes }, .extraTrackGroups = {TrackGroup::slopeSteepLong, TrackGroup::halfLoopLarge}, diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index d32207c97254..c2abcd881b1e 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionWildMouse, + .trackStyle = TrackStyle::steelWildMouse, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight,TrackGroup::stationEnd,TrackGroup::liftHill, TrackGroup::slope,TrackGroup::flatToSteepSlope,TrackGroup::curveVerySmall,TrackGroup::curveSmall, TrackGroup::brakes,TrackGroup::blockBrakes,TrackGroup::rotationControlToggle}, .extraTrackGroups = {TrackGroup::liftHillSteep, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve}, diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h index 89785d79e7ce..1cead178df70 100644 --- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniRC, + .trackStyle = TrackStyle::miniRollerCoaster, .supportType = MetalSupportType::Fork, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, 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::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::liftHillCurved}, .extraTrackGroups = {TrackGroup::booster, TrackGroup::liftHill}, diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h index 2d6c9555d646..41e578664836 100644 --- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionStandUpRC, + .trackStyle = TrackStyle::standUpRollerCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {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::halfLoop, TrackGroup::corkscrew, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::blockBrakes, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h index 553bc49cebec..01dbf40f77be 100644 --- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionWildMouse, + .trackStyle = TrackStyle::steelWildMouse, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::brakes, TrackGroup::blockBrakes}, .extraTrackGroups = {TrackGroup::rotationControlToggle}, diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h index f57690723b43..36955693cf16 100644 --- a/src/openrct2/ride/rtd/coaster/Steeplechase.h +++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SteeplechaseRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSteeplechase, + .trackStyle = TrackStyle::steeplechase, .supportType = MetalSupportType::Stick, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::brakes, TrackGroup::blockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h index 53ba3f683457..8456cc9ee15d 100644 --- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSuspendedSwingingRC, + .trackStyle = TrackStyle::suspendedSwingingCoaster, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::slopeCurve, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownUnbankedQuarter, TrackGroup::helixUpUnbankedQuarter, TrackGroup::brakes, TrackGroup::blockBrakes}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h index 841f8f624972..622325f11e0f 100644 --- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionTwisterRC, + .trackStyle = TrackStyle::twisterRollerCoaster, .supportType = MetalSupportType::Tubes, .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::halfLoop, TrackGroup::corkscrew, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::barrelRoll, TrackGroup::poweredLift, TrackGroup::halfLoopLarge, TrackGroup::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::slopeSteepLong, TrackGroup::curveVertical, TrackGroup::quarterLoop, TrackGroup::booster, TrackGroup::twist, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeCurveLarge, TrackGroup::corkscrewLarge, TrackGroup::halfLoopMedium, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge}, .extraTrackGroups = {TrackGroup::liftHillSteep, TrackGroup::brakeForDrop}, diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h index 1b159dceab4c..6881780d838c 100644 --- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h +++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionTwisterRC, + .trackStyle = TrackStyle::twisterRollerCoaster, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::flat, TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::liftHillSteep, TrackGroup::flatRollBanking, TrackGroup::verticalLoop, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::flatToSteepSlope, TrackGroup::slopeCurve, TrackGroup::slopeCurveSteep, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge, TrackGroup::helixDownBankedHalf, TrackGroup::helixUpBankedHalf, TrackGroup::brakes, TrackGroup::onridePhoto, TrackGroup::slopeVertical, TrackGroup::slopeCurveBanked, TrackGroup::blockBrakes, TrackGroup::slopeRollBanking, TrackGroup::curveVertical, TrackGroup::halfLoopLarge, TrackGroup::brakeForDrop, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes, TrackGroup::slopeCurveLarge, TrackGroup::halfLoopMedium, TrackGroup::zeroGRoll, TrackGroup::zeroGRollLarge, TrackGroup::corkscrew, TrackGroup::corkscrewLarge}, .extraTrackGroups = {TrackGroup::halfLoop, TrackGroup::barrelRoll, TrackGroup::poweredLift, TrackGroup::halfLoopLarge, TrackGroup::quarterLoop, TrackGroup::booster, TrackGroup::twist}, diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index 0b536b1d9909..068ea19d5579 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionVirginiaReel, + .trackStyle = TrackStyle::virginiaReel, .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 7d7745523f34..4039bccdfa44 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -23,7 +23,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { - .Drawer = GetTrackPaintFunctionWaterRC, + .trackStyle = TrackStyle::waterCoaster, .supportType = MetalSupportType::Fork, .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::blockBrakes, TrackGroup::onridePhoto, TrackGroup::booster, TrackGroup::diagBrakes, TrackGroup::diagBlockBrakes}, .extraTrackGroups = {TrackGroup::flatToSteepSlope}, @@ -31,7 +31,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .tooltip = STR_RIDE_CONSTRUCTION_STANDARD_RC_TRACK_TIP, }, { - .Drawer = GetTrackPaintFunctionSplashBoats, + .trackStyle = TrackStyle::splashBoats, .supportType = WoodenSupportType::Truss, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::curve, TrackGroup::sBend }, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index b1947d6fe363..acc046a7e035 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionWoodenRC, + .trackStyle = TrackStyle::woodenRollerCoaster, .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 5ca73a52cf99..f7edb3d03a4b 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .Category = RIDE_CATEGORY_ROLLERCOASTER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionWoodenWildMouse, + .trackStyle = TrackStyle::woodenWildMouse, .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/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h index eaf8841c6246..e7e474973458 100644 --- a/src/openrct2/ride/rtd/gentle/CarRide.h +++ b/src/openrct2/ride/rtd/gentle/CarRide.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor CarRideRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCarRide, + .trackStyle = TrackStyle::carRide, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::spinningTunnel}, .extraTrackGroups = {TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::rapids}, diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h index bec6193f9938..0629e3909a5e 100644 --- a/src/openrct2/ride/rtd/gentle/Circus.h +++ b/src/openrct2/ride/rtd/gentle/Circus.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor CircusRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCircus, + .trackStyle = TrackStyle::circus, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h index 1d30eae8f238..76c437cf9465 100644 --- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h +++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor CrookedHouseRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCrookedHouse, + .trackStyle = TrackStyle::crookedHouse, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h index 3b48d42e7654..e1318ce19ee0 100644 --- a/src/openrct2/ride/rtd/gentle/Dodgems.h +++ b/src/openrct2/ride/rtd/gentle/Dodgems.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor DodgemsRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionDodgems, + .trackStyle = TrackStyle::dodgems, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h index afae1776c393..6f28ee3d4d24 100644 --- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h +++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor FerrisWheelRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4C, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFerrisWheel, + .trackStyle = TrackStyle::ferrisWheel, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h index 15d37f137df1..1d03bb886d82 100644 --- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h +++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFlyingSaucers, + .trackStyle = TrackStyle::flyingSaucers, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h index f9c00ea8420a..4beb5896f8f0 100644 --- a/src/openrct2/ride/rtd/gentle/GhostTrain.h +++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor GhostTrainRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionGhostTrain, + .trackStyle = TrackStyle::ghostTrain, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::brakes, TrackGroup::spinningTunnel}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h index 33f64c420d49..8f23c12f83be 100644 --- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h +++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor HauntedHouseRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionHauntedHouse, + .trackStyle = TrackStyle::hauntedHouse, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h index 4e53d6a5b4c1..5aee9f40e3de 100644 --- a/src/openrct2/ride/rtd/gentle/Maze.h +++ b/src/openrct2/ride/rtd/gentle/Maze.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor MazeRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::Maze, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMaze, + .trackStyle = TrackStyle::maze, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h index 2525ccf73685..01868a1566d7 100644 --- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h +++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMerryGoRound, + .trackStyle = TrackStyle::merryGoRound, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h index 78a8be78f8ac..56e18e3664d6 100644 --- a/src/openrct2/ride/rtd/gentle/MiniGolf.h +++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MiniGolfRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniGolf, + .trackStyle = TrackStyle::miniGolf, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::miniGolfHole}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h index 221757b64fe3..3e88af0a1485 100644 --- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h +++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniHelicopters, + .trackStyle = TrackStyle::miniHelicopters, .supportType = MetalSupportType::Stick, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall, TrackGroup::curveSmall}, .extraTrackGroups = {TrackGroup::spinningTunnel}, diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h index 60e36a770c30..4620f092d2b0 100644 --- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h +++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMonorailCycles, + .trackStyle = TrackStyle::monorailCycles, .supportType = MetalSupportType::Stick, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 8c8f203b382e..7c10c41910ed 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionCarRide, + .trackStyle = TrackStyle::carRide, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::curveVerySmall, TrackGroup::curveSmall, TrackGroup::rapids}, .extraTrackGroups = {TrackGroup::spinningTunnel}, diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h index 1e5169f263a8..aceae80fcc8e 100644 --- a/src/openrct2/ride/rtd/gentle/ObservationTower.h +++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ObservationTowerRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionObservationTower, + .trackStyle = TrackStyle::observationTower, .enabledTrackGroups = {TrackGroup::tower}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h index 59b5b0504b74..c900648837dd 100644 --- a/src/openrct2/ride/rtd/gentle/SpaceRings.h +++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SpaceRingsRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSpaceRings, + .trackStyle = TrackStyle::spaceRings, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h index 883b48e81eaf..ba0044f657ad 100644 --- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h +++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SpiralSlideRTD = .Category = RIDE_CATEGORY_GENTLE, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack2x2, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSpiralSlide, + .trackStyle = TrackStyle::spiralSlide, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/CashMachine.h b/src/openrct2/ride/rtd/shops/CashMachine.h index b78f85e4e873..9fa3a652f6f6 100644 --- a/src/openrct2/ride/rtd/shops/CashMachine.h +++ b/src/openrct2/ride/rtd/shops/CashMachine.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor CashMachineRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionShop, + .trackStyle = TrackStyle::shop, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/DrinkStall.h b/src/openrct2/ride/rtd/shops/DrinkStall.h index 562933a66692..84c1f7511716 100644 --- a/src/openrct2/ride/rtd/shops/DrinkStall.h +++ b/src/openrct2/ride/rtd/shops/DrinkStall.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor DrinkStallRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionShop, + .trackStyle = TrackStyle::shop, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/FirstAid.h b/src/openrct2/ride/rtd/shops/FirstAid.h index da13a5d2c330..cba81b698ccd 100644 --- a/src/openrct2/ride/rtd/shops/FirstAid.h +++ b/src/openrct2/ride/rtd/shops/FirstAid.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor FirstAidRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFacility, + .trackStyle = TrackStyle::facility, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/FoodStall.h b/src/openrct2/ride/rtd/shops/FoodStall.h index 62d63a91b12d..be50c792b1f8 100644 --- a/src/openrct2/ride/rtd/shops/FoodStall.h +++ b/src/openrct2/ride/rtd/shops/FoodStall.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor FoodStallRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionShop, + .trackStyle = TrackStyle::shop, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/InformationKiosk.h b/src/openrct2/ride/rtd/shops/InformationKiosk.h index cb9ec5b63d4a..3e1bf4ecb795 100644 --- a/src/openrct2/ride/rtd/shops/InformationKiosk.h +++ b/src/openrct2/ride/rtd/shops/InformationKiosk.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor InformationKioskRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1B, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionShop, + .trackStyle = TrackStyle::shop, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/Shop.h b/src/openrct2/ride/rtd/shops/Shop.h index a4ab31375823..85e043f5b50f 100644 --- a/src/openrct2/ride/rtd/shops/Shop.h +++ b/src/openrct2/ride/rtd/shops/Shop.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor ShopRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionShop, + .trackStyle = TrackStyle::shop, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/shops/Toilets.h b/src/openrct2/ride/rtd/shops/Toilets.h index d88e44a25b0e..36718a8dc1e0 100644 --- a/src/openrct2/ride/rtd/shops/Toilets.h +++ b/src/openrct2/ride/rtd/shops/Toilets.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor ToiletsRTD = .Category = RIDE_CATEGORY_SHOP, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x1A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionFacility, + .trackStyle = TrackStyle::facility, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/3DCinema.h b/src/openrct2/ride/rtd/thrill/3DCinema.h index d9234a99eac1..9ff0cc6adb77 100644 --- a/src/openrct2/ride/rtd/thrill/3DCinema.h +++ b/src/openrct2/ride/rtd/thrill/3DCinema.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor CinemaRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunction3dCinema, + .trackStyle = TrackStyle::_3DCinema, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h index 58ea36848f81..ef20f2e019c5 100644 --- a/src/openrct2/ride/rtd/thrill/Enterprise.h +++ b/src/openrct2/ride/rtd/thrill/Enterprise.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor EnterpriseRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack4x4, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionEnterprise, + .trackStyle = TrackStyle::enterprise, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index 1b9dd6b8379b..69e9c2c963d2 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor GoKartsRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionGoKarts, + .trackStyle = TrackStyle::goKarts, .supportType = WoodenSupportType::Truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h index 0a80e45a99ce..93b363aa3ce4 100644 --- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h +++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLaunchedFreefall, + .trackStyle = TrackStyle::launchedFreefall, .enabledTrackGroups = {TrackGroup::tower}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h index 40cede2fdb37..801792006e2b 100644 --- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h +++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor MagicCarpetRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4A, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMagicCarpet, + .trackStyle = TrackStyle::magicCarpet, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/MotionSimulator.h b/src/openrct2/ride/rtd/thrill/MotionSimulator.h index f600dc221e89..60f85994e9ac 100644 --- a/src/openrct2/ride/rtd/thrill/MotionSimulator.h +++ b/src/openrct2/ride/rtd/thrill/MotionSimulator.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor MotionSimulatorRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack2x2, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMotionsimulator, + .trackStyle = TrackStyle::motionSimulator, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h index a6271bf6a1d2..68058b784c35 100644 --- a/src/openrct2/ride/rtd/thrill/RotoDrop.h +++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor RotoDropRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionRotoDrop, + .trackStyle = TrackStyle::rotoDrop, .enabledTrackGroups = {TrackGroup::tower}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h index 6b2275719f89..76b0eb07daba 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x4B, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSwingingInverterShip, + .trackStyle = TrackStyle::swingingInverterShip, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h index 30dca2caa57d..3589f4ea98dd 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SwingingShipRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack1x5, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSwingingShip, + .trackStyle = TrackStyle::swingingShip, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/TopSpin.h b/src/openrct2/ride/rtd/thrill/TopSpin.h index 41c5d022ebc7..ca5e3b1e40e4 100644 --- a/src/openrct2/ride/rtd/thrill/TopSpin.h +++ b/src/openrct2/ride/rtd/thrill/TopSpin.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor TopSpinRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionTopspin, + .trackStyle = TrackStyle::topSpin, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h index 958d1177ec6f..18d66aefcc9b 100644 --- a/src/openrct2/ride/rtd/thrill/Twist.h +++ b/src/openrct2/ride/rtd/thrill/Twist.h @@ -19,7 +19,7 @@ constexpr RideTypeDescriptor TwistRTD = .Category = RIDE_CATEGORY_THRILL, .StartTrackPiece = OpenRCT2::TrackElemType::FlatTrack3x3, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionTwist, + .trackStyle = TrackStyle::twist, .enabledTrackGroups = {}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h index d2d4f96ff44e..29decac63b02 100644 --- a/src/openrct2/ride/rtd/transport/Chairlift.h +++ b/src/openrct2/ride/rtd/transport/Chairlift.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor ChairliftRTD = .Category = RIDE_CATEGORY_TRANSPORT, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionChairlift, + .trackStyle = TrackStyle::chairlift, .supportType = MetalSupportType::Truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::curveVerySmall}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h index 5e0c763ee334..ceadc3ecff8a 100644 --- a/src/openrct2/ride/rtd/transport/Lift.h +++ b/src/openrct2/ride/rtd/transport/Lift.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LiftRTD = .Category = RIDE_CATEGORY_TRANSPORT, .StartTrackPiece = OpenRCT2::TrackElemType::TowerBase, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLift, + .trackStyle = TrackStyle::lift, .enabledTrackGroups = {TrackGroup::tower}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index b254ec344cae..eaebd64aa11d 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = .Category = RIDE_CATEGORY_TRANSPORT, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMiniatureRailway, + .trackStyle = TrackStyle::miniatureRailway, .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/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h index 5933298fedd5..cbe3d8917f48 100644 --- a/src/openrct2/ride/rtd/transport/Monorail.h +++ b/src/openrct2/ride/rtd/transport/Monorail.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor MonorailRTD = .Category = RIDE_CATEGORY_TRANSPORT, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionMonorail, + .trackStyle = TrackStyle::monorail, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h index b0fd090aeeed..67607db54787 100644 --- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h +++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = .Category = RIDE_CATEGORY_TRANSPORT, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSuspendedMonorail, + .trackStyle = TrackStyle::suspendedMonorail, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve, TrackGroup::curveLarge}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h index cafff1d78f08..ae66cf85839b 100644 --- a/src/openrct2/ride/rtd/water/BoatHire.h +++ b/src/openrct2/ride/rtd/water/BoatHire.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor BoatHireRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionBoatHire, + .trackStyle = TrackStyle::boatHire, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::curveVerySmall}, .extraTrackGroups = {}, }), diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h index a1314111b4c1..54a1d2cdc723 100644 --- a/src/openrct2/ride/rtd/water/DinghySlide.h +++ b/src/openrct2/ride/rtd/water/DinghySlide.h @@ -22,7 +22,7 @@ constexpr RideTypeDescriptor DinghySlideRTD = .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor( { - .Drawer = GetTrackPaintFunctionDinghySlide, + .trackStyle = TrackStyle::dinghySlide, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::liftHill, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::curve }, .extraTrackGroups = {}, @@ -30,7 +30,7 @@ constexpr RideTypeDescriptor DinghySlideRTD = .tooltip = STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP, }, { - .Drawer = GetTrackPaintFunctionDinghySlideCovered, + .trackStyle = TrackStyle::dinghySlideCovered, .supportType = MetalSupportType::Tubes, .enabledTrackGroups = { TrackGroup::straight, TrackGroup::slope, TrackGroup::slopeSteepUp, TrackGroup::slopeSteepDown, TrackGroup::curve, TrackGroup::sBend, TrackGroup::curveSmall }, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index f4bae6ee9d7c..8d10ae266d10 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor LogFlumeRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionLogFlume, + .trackStyle = TrackStyle::logFlume, .supportType = MetalSupportType::Boxed, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::sBend, TrackGroup::curveSmall, TrackGroup::onridePhoto, TrackGroup::logFlumeReverser, TrackGroup::slopeSteepDown}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index ae7febaa5545..4893773aacb7 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor RiverRaftsRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSplashBoats, + .trackStyle = TrackStyle::splashBoats, .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 81bd26428311..55a21d9be7d6 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -20,7 +20,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionRiverRapids, + .trackStyle = TrackStyle::riverRapids, .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 a44c58c82c4b..0733427f9054 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSplashBoats, + .trackStyle = TrackStyle::splashBoats, .supportType = WoodenSupportType::Truss, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::slope, TrackGroup::slopeSteepDown, TrackGroup::sBend, TrackGroup::curve, TrackGroup::onridePhoto}, .extraTrackGroups = {}, diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h index 81f115837b96..916025c1e877 100644 --- a/src/openrct2/ride/rtd/water/SubmarineRide.h +++ b/src/openrct2/ride/rtd/water/SubmarineRide.h @@ -21,7 +21,7 @@ constexpr RideTypeDescriptor SubmarineRideRTD = .Category = RIDE_CATEGORY_WATER, .StartTrackPiece = OpenRCT2::TrackElemType::EndStation, .TrackPaintFunctions = TrackDrawerDescriptor({ - .Drawer = GetTrackPaintFunctionSubmarineRide, + .trackStyle = TrackStyle::submarineRide, .supportType = MetalSupportType::Stick, .enabledTrackGroups = {TrackGroup::straight, TrackGroup::stationEnd, TrackGroup::curveVerySmall, TrackGroup::curveSmall}, .extraTrackGroups = {},