From c2153ae797afff3bcc2d909aaa30e82ac6ea9c1c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 19 Jul 2020 14:41:40 +0200 Subject: [PATCH] Consistenly use 'Swinging Ship' --- OpenRCT2.xcodeproj/project.pbxproj | 8 ++-- src/openrct2/libopenrct2.vcxproj | 4 +- src/openrct2/localisation/StringIds.h | 4 +- src/openrct2/ride/RideRatings.cpp | 2 +- src/openrct2/ride/RideRatings.h | 2 +- src/openrct2/ride/TrackPaint.h | 2 +- .../{PirateShip.cpp => SwingingShip.cpp} | 46 +++++++++---------- src/openrct2/ride/thrill/meta/SwingingShip.h | 8 ++-- src/openrct2/sprites.h | 4 +- test/testpaint/Compat.cpp | 2 +- test/testpaint/Data.cpp | 2 +- test/testpaint/TrackDataOld.cpp | 4 +- 12 files changed, 44 insertions(+), 44 deletions(-) rename src/openrct2/ride/thrill/{PirateShip.cpp => SwingingShip.cpp} (87%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 7679787195..636648106b 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -404,7 +404,7 @@ C688792120289B9B0084B384 /* LaunchedFreefall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */; }; C688792220289B9B0084B384 /* MagicCarpet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */; }; C688792320289B9B0084B384 /* MotionSimulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */; }; - C688792420289B9B0084B384 /* PirateShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1841F8B747A00A9330D /* PirateShip.cpp */; }; + C688792420289B9B0084B384 /* SwingingShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1841F8B747A00A9330D /* SwingingShip.cpp */; }; C688792520289B9B0084B384 /* RotoDrop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1851F8B747A00A9330D /* RotoDrop.cpp */; }; C688792620289B9B0084B384 /* SwingingInverterShip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */; }; C688792720289B9B0084B384 /* TopSpin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1871F8B747A00A9330D /* TopSpin.cpp */; }; @@ -906,7 +906,7 @@ 4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LaunchedFreefall.cpp; sourceTree = ""; }; 4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MagicCarpet.cpp; sourceTree = ""; }; 4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotionSimulator.cpp; sourceTree = ""; }; - 4C93F1841F8B747A00A9330D /* PirateShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PirateShip.cpp; sourceTree = ""; }; + 4C93F1841F8B747A00A9330D /* SwingingShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SwingingShip.cpp; sourceTree = ""; }; 4C93F1851F8B747A00A9330D /* RotoDrop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RotoDrop.cpp; sourceTree = ""; }; 4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SwingingInverterShip.cpp; sourceTree = ""; }; 4C93F1871F8B747A00A9330D /* TopSpin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TopSpin.cpp; sourceTree = ""; }; @@ -3297,7 +3297,7 @@ 4C93F1811F8B747A00A9330D /* LaunchedFreefall.cpp */, 4C93F1821F8B747A00A9330D /* MagicCarpet.cpp */, 4C93F1831F8B747A00A9330D /* MotionSimulator.cpp */, - 4C93F1841F8B747A00A9330D /* PirateShip.cpp */, + 4C93F1841F8B747A00A9330D /* SwingingShip.cpp */, 4C93F1851F8B747A00A9330D /* RotoDrop.cpp */, 4C93F1861F8B747A00A9330D /* SwingingInverterShip.cpp */, 4C93F1871F8B747A00A9330D /* TopSpin.cpp */, @@ -4311,7 +4311,7 @@ C688791B20289B9B0084B384 /* SpiralSlide.cpp in Sources */, C688786C20289A6F0084B384 /* TrackDesign.cpp in Sources */, C68878F220289B9B0084B384 /* GigaCoaster.cpp in Sources */, - C688792420289B9B0084B384 /* PirateShip.cpp in Sources */, + C688792420289B9B0084B384 /* SwingingShip.cpp in Sources */, C68878F420289B9B0084B384 /* InvertedHairpinCoaster.cpp in Sources */, C68878A620289B2A0084B384 /* Finance.cpp in Sources */, C688788720289ADE0084B384 /* TTFSDLPort.cpp in Sources */, diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 15ce7c8d7d..5279ccf949 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -696,7 +696,7 @@ - + @@ -764,4 +764,4 @@ - \ No newline at end of file + diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index 43903e8c7c..0f4f2821a1 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -45,7 +45,7 @@ enum STR_RIDE_NAME_LOG_FLUME = 25, STR_RIDE_NAME_RIVER_RAPIDS = 26, STR_RIDE_NAME_DODGEMS = 27, - STR_RIDE_NAME_PIRATE_SHIP = 28, + STR_RIDE_NAME_SWINGING_SHIP = 28, STR_RIDE_NAME_SWINGING_INVERTER_SHIP = 29, STR_RIDE_NAME_FOOD_STALL = 30, STR_RIDE_NAME_1D = 31, @@ -137,7 +137,7 @@ enum STR_RIDE_DESCRIPTION_LOG_FLUME = 535, STR_RIDE_DESCRIPTION_RIVER_RAPIDS = 536, STR_RIDE_DESCRIPTION_DODGEMS = 537, - STR_RIDE_DESCRIPTION_PIRATE_SHIP = 538, + STR_RIDE_DESCRIPTION_SWINGING_SHIP = 538, STR_RIDE_DESCRIPTION_SWINGING_INVERTER_SHIP = 539, STR_RIDE_DESCRIPTION_FOOD_STALL = 540, diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index e19c3240ad..64a21b299d 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -2706,7 +2706,7 @@ void ride_ratings_calculate_dodgems(Ride* ride) ride->sheltered_eighths = 7; } -void ride_ratings_calculate_pirate_ship(Ride* ride) +void ride_ratings_calculate_swinging_ship(Ride* ride) { ride->lifecycle_flags |= RIDE_LIFECYCLE_TESTED; ride->lifecycle_flags |= RIDE_LIFECYCLE_NO_RAW_STATS; diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h index 641815dd1c..2b3f9121f1 100644 --- a/src/openrct2/ride/RideRatings.h +++ b/src/openrct2/ride/RideRatings.h @@ -87,7 +87,7 @@ void ride_ratings_calculate_go_karts(Ride* ride); void ride_ratings_calculate_log_flume(Ride* ride); void ride_ratings_calculate_river_rapids(Ride* ride); void ride_ratings_calculate_dodgems(Ride* ride); -void ride_ratings_calculate_pirate_ship(Ride* ride); +void ride_ratings_calculate_swinging_ship(Ride* ride); void ride_ratings_calculate_inverter_ship(Ride* ride); void ride_ratings_calculate_food_stall(Ride* ride); void ride_ratings_calculate_shop(Ride* ride); diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index 64f8ad6742..606c72b966 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -419,7 +419,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_go_karts(int32_t trackType, int32_ TRACK_PAINT_FUNCTION get_track_paint_function_log_flume(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_river_rapids(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_dodgems(int32_t trackType, int32_t direction); -TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int32_t trackType, int32_t direction); +TRACK_PAINT_FUNCTION get_track_paint_function_swinging_ship(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_swinging_inverter_ship(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_ferris_wheel(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_motionsimulator(int32_t trackType, int32_t direction); diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/SwingingShip.cpp similarity index 87% rename from src/openrct2/ride/thrill/PirateShip.cpp rename to src/openrct2/ride/thrill/SwingingShip.cpp index 45ddc17fe8..8039c2ed24 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/SwingingShip.cpp @@ -22,7 +22,7 @@ static constexpr const uint8_t track_map_1x5[][5] = { { 0, 1, 2, 3, 4 }, }; -struct pirate_ship_bound_box +struct swinging_ship_bound_box { int16_t length_x; int16_t length_y; @@ -31,10 +31,10 @@ struct pirate_ship_bound_box }; /** rct2: 0x008A83B0 */ -static constexpr const uint32_t pirate_ship_base_sprite_offset[] = { 0, 9, 0, 9 }; +static constexpr const uint32_t swinging_ship_base_sprite_offset[] = { 0, 9, 0, 9 }; /** rct2: 0x008A83C0 */ -static constexpr const pirate_ship_bound_box pirate_ship_data[] = { +static constexpr const swinging_ship_bound_box swinging_ship_data[] = { { 31, 16, 1, 8 }, { 16, 31, 8, 1 }, { 31, 16, 1, 8 }, @@ -43,19 +43,19 @@ static constexpr const pirate_ship_bound_box pirate_ship_data[] = { enum { - SPR_PIRATE_SHIP_FRAME_SW_NE = 21994, - SPR_PIRATE_SHIP_FRAME_FRONT_SW_NE = 21995, - SPR_PIRATE_SHIP_FRAME_NW_SE = 21996, - SPR_PIRATE_SHIP_FRAME_FRONT_NW_SE = 21997, + SPR_SWINGING_SHIP_FRAME_SW_NE = 21994, + SPR_SWINGING_SHIP_FRAME_FRONT_SW_NE = 21995, + SPR_SWINGING_SHIP_FRAME_NW_SE = 21996, + SPR_SWINGING_SHIP_FRAME_FRONT_NW_SE = 21997, }; -static constexpr const uint32_t pirate_ship_frame_sprites[][2] = { - { SPR_PIRATE_SHIP_FRAME_SW_NE, SPR_PIRATE_SHIP_FRAME_FRONT_SW_NE }, - { SPR_PIRATE_SHIP_FRAME_NW_SE, SPR_PIRATE_SHIP_FRAME_FRONT_NW_SE }, +static constexpr const uint32_t swinging_ship_frame_sprites[][2] = { + { SPR_SWINGING_SHIP_FRAME_SW_NE, SPR_SWINGING_SHIP_FRAME_FRONT_SW_NE }, + { SPR_SWINGING_SHIP_FRAME_NW_SE, SPR_SWINGING_SHIP_FRAME_FRONT_NW_SE }, }; /** rct2: 0x4AF254 */ -static void paint_pirate_ship_structure( +static void paint_swinging_ship_structure( paint_session* session, Ride* ride, uint8_t direction, int8_t axisOffset, uint16_t height) { uint32_t imageId, baseImageId; @@ -78,7 +78,7 @@ static void paint_pirate_ship_structure( session->CurrentlyDrawnItem = vehicle; } - baseImageId = rideEntry->vehicles[0].base_image_id + pirate_ship_base_sprite_offset[direction]; + baseImageId = rideEntry->vehicles[0].base_image_id + swinging_ship_base_sprite_offset[direction]; if (vehicle != nullptr) { int32_t rotation = static_cast(vehicle->vehicle_sprite_type); @@ -103,9 +103,9 @@ static void paint_pirate_ship_structure( imageColourFlags = SPRITE_ID_PALETTE_COLOUR_2(ride->vehicle_colours[0].Body, ride->vehicle_colours[0].Trim); } - pirate_ship_bound_box bounds = pirate_ship_data[direction]; + swinging_ship_bound_box bounds = swinging_ship_data[direction]; - imageId = pirate_ship_frame_sprites[(direction & 1)][0] | session->TrackColours[SCHEME_TRACK]; + imageId = swinging_ship_frame_sprites[(direction & 1)][0] | session->TrackColours[SCHEME_TRACK]; sub_98197C( session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y, height); @@ -156,7 +156,7 @@ static void paint_pirate_ship_structure( } } - imageId = pirate_ship_frame_sprites[(direction & 1)][1] | session->TrackColours[SCHEME_TRACK]; + imageId = swinging_ship_frame_sprites[(direction & 1)][1] | session->TrackColours[SCHEME_TRACK]; sub_98199C( session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y, height); @@ -166,7 +166,7 @@ static void paint_pirate_ship_structure( } /** rct2: 0x008A85C4 */ -static void paint_pirate_ship( +static void paint_swinging_ship( paint_session* session, ride_id_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, const TileElement* tileElement) { @@ -296,19 +296,19 @@ static void paint_pirate_ship( switch (relativeTrackSequence) { case 1: - paint_pirate_ship_structure(session, ride, direction, 64, height); + paint_swinging_ship_structure(session, ride, direction, 64, height); break; case 2: - paint_pirate_ship_structure(session, ride, direction, 32, height); + paint_swinging_ship_structure(session, ride, direction, 32, height); break; case 0: - paint_pirate_ship_structure(session, ride, direction, 0, height); + paint_swinging_ship_structure(session, ride, direction, 0, height); break; case 3: - paint_pirate_ship_structure(session, ride, direction, -32, height); + paint_swinging_ship_structure(session, ride, direction, -32, height); break; case 4: - paint_pirate_ship_structure(session, ride, direction, -64, height); + paint_swinging_ship_structure(session, ride, direction, -64, height); break; } @@ -318,12 +318,12 @@ static void paint_pirate_ship( /** * rct2: 0x008A83E0 */ -TRACK_PAINT_FUNCTION get_track_paint_function_pirate_ship(int32_t trackType, int32_t direction) +TRACK_PAINT_FUNCTION get_track_paint_function_swinging_ship(int32_t trackType, int32_t direction) { if (trackType != FLAT_TRACK_ELEM_1_X_5) { return nullptr; } - return paint_pirate_ship; + return paint_swinging_ship; } diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index f0c3d7723a..dfac085c8d 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -23,7 +23,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(ExtraTrackPieces, 0), SET_FIELD(CoveredTrackPieces, 0), SET_FIELD(StartTrackPiece, FLAT_TRACK_ELEM_1_X_5), - SET_FIELD(TrackPaintFunction, get_track_paint_function_pirate_ship), + SET_FIELD(TrackPaintFunction, get_track_paint_function_swinging_ship), SET_FIELD(Flags, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION | RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_VEHICLE_IS_INTEGRAL | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | @@ -32,14 +32,14 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(RideModes, (1ULL << RIDE_MODE_SWING)), SET_FIELD(DefaultMode, RIDE_MODE_SWING), SET_FIELD(OperatingSettings, { 7, 25, 0, 0, 0, 0 }), - SET_FIELD(Naming, { STR_RIDE_NAME_PIRATE_SHIP, STR_RIDE_DESCRIPTION_PIRATE_SHIP }), + SET_FIELD(Naming, { STR_RIDE_NAME_SWINGING_SHIP, STR_RIDE_DESCRIPTION_SWINGING_SHIP }), SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_SHIP, RIDE_COMPONENT_TYPE_STRUCTURE, RIDE_COMPONENT_TYPE_STATION }), SET_FIELD(EnumName, nameof(RIDE_TYPE_SWINGING_SHIP)), SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)), SET_FIELD(Heights, { 12, 112, 7, 11, }), SET_FIELD(MaxMass, 255), SET_FIELD(LiftData, { SoundId::Null, 5, 5 }), - SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_pirate_ship), + SET_FIELD(RatingsCalculationFunction, ride_ratings_calculate_swinging_ship), SET_FIELD(RatingsMultipliers, { 50, 30, 10 }), SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 155, 2, 1, }), @@ -50,7 +50,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( { COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_BLACK }, )), - SET_FIELD(ColourPreview, { SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS }), + SET_FIELD(ColourPreview, { SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_SUPPORTS }), SET_FIELD(ColourKey, RideColourKey::Ride), }; // clang-format on diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9b8729b886..f8eb4e2493 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -601,8 +601,8 @@ enum SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS = 14271, SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK = 14272, SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS = 14273, - SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK = 14274, - SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS = 14275, + SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_TRACK = 14274, + SPR_RIDE_DESIGN_PREVIEW_SWINGING_SHIP_SUPPORTS = 14275, SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK = 14276, SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS = 14277, diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index 96a64b4009..1ff230e944 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -634,7 +634,7 @@ void ride_ratings_calculate_dodgems([[maybe_unused]] Ride* ride) { } -void ride_ratings_calculate_pirate_ship([[maybe_unused]] Ride* ride) +void ride_ratings_calculate_swinging_ship([[maybe_unused]] Ride* ride) { } diff --git a/test/testpaint/Data.cpp b/test/testpaint/Data.cpp index d0e471677a..ab84dda5a3 100644 --- a/test/testpaint/Data.cpp +++ b/test/testpaint/Data.cpp @@ -37,7 +37,7 @@ const_utf8string RideNames[RCT2_RIDE_TYPE_COUNT] = { "LogFlume", "RiverRapids", "Dodgems", - "PirateShip", + "SwingingShip", "SwingingInverterShip", "FoodStall", "1D", diff --git a/test/testpaint/TrackDataOld.cpp b/test/testpaint/TrackDataOld.cpp index c8ea066427..f5c95e0fc4 100644 --- a/test/testpaint/TrackDataOld.cpp +++ b/test/testpaint/TrackDataOld.cpp @@ -6773,7 +6773,7 @@ static constexpr const uint32_t _OldDodgemsTrackPaintFunctions[256] = { }; /** rct2: 0x008A83E0 */ -static constexpr const uint32_t _OldPirateShipTrackPaintFunctions[256] = { +static constexpr const uint32_t _OldSwingingShipTrackPaintFunctions[256] = { 0, 0, 0, @@ -19289,7 +19289,7 @@ const uint32_t * RideTypeTrackPaintFunctionsOld[RCT2_RIDE_TYPE_COUNT] = { _OldLogFlumeTrackPaintFunctions, // RIDE_TYPE_LOG_FLUME _OldRiverRapidsTrackPaintFunctions, // RIDE_TYPE_RIVER_RAPIDS _OldDodgemsTrackPaintFunctions, // RIDE_TYPE_DODGEMS - _OldPirateShipTrackPaintFunctions, // RIDE_TYPE_SWINGING_SHIP + _OldSwingingShipTrackPaintFunctions, // RIDE_TYPE_SWINGING_SHIP _OldSwingingInverterShipTrackPaintFunctions, // RIDE_TYPE_SWINGING_INVERTER_SHIP _OldShopTrackPaintFunctions, // RIDE_TYPE_FOOD_STALL _OldShopTrackPaintFunctions, // RIDE_TYPE_1D