mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use RCT1 table method for converting ride type

This commit is contained in:
Ted John 2016-10-15 12:53:15 +01:00
parent 951bfaa081
commit 6316d9eb20
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rct1/Tables.h
View File

@ -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);

5
src/rct1/tables.cpp
View File

@ -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);

10
src/ride/track_design.c
View File

@ -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;
}