diff --git a/src/rct1/Tables.h b/src/rct1/Tables.h index e723ceaffe..f4fd1ebefd 100644 --- a/src/rct1/Tables.h +++ b/src/rct1/Tables.h @@ -50,6 +50,7 @@ namespace RCT1 extern "C" { #endif + uint8 rct1_get_ride_type(uint8 rideType); const char * rct1_get_ride_type_object(uint8 rideType); const char * rct1_get_vehicle_object(uint8 vehicleType); diff --git a/src/rct1/tables.cpp b/src/rct1/tables.cpp index dfd14d8465..ca4a1ee0e0 100644 --- a/src/rct1/tables.cpp +++ b/src/rct1/tables.cpp @@ -1113,6 +1113,11 @@ namespace RCT1 extern "C" { + uint8 rct1_get_ride_type(uint8 rideType) + { + return RCT1::GetRideType(rideType); + } + const char * rct1_get_ride_type_object(uint8 rideType) { return RCT1::GetRideTypeObject(rideType); diff --git a/src/ride/track_design.c b/src/ride/track_design.c index 17ea949c38..2cfb274881 100644 --- a/src/ride/track_design.c +++ b/src/ride/track_design.c @@ -158,16 +158,10 @@ static rct_track_td6 * track_design_open_from_td4(uint8 *src, size_t srcLength) return NULL; } - // Convert RCT1 ride type to RCT2 ride type - if (td4->type == RCT1_RIDE_TYPE_WOODEN_ROLLER_COASTER) { - td6->type = RIDE_TYPE_WOODEN_ROLLER_COASTER; - td6->ride_mode = td4->mode; - } else { - td6->type = td4->type; - td6->ride_mode = td4->mode; - } + td6->type = rct1_get_ride_type(td4->type); // All TD4s that use powered launch use the type that doesn't pass the station. + td6->ride_mode = td4->mode; if (td4->mode == RCT1_RIDE_MODE_POWERED_LAUNCH) { td6->ride_mode = RIDE_MODE_POWERED_LAUNCH; }