mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

fix more import bugs

Browse Source
This commit is contained in:
Ted John
2016-04-17 22:18:54 +01:00
parent 7401b5cf39
commit b93429052c
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rct1/S4Importer.cpp
View File

@@ -343,7 +343,14 @@ void S4Importer::ImportRide(rct_ride * dst, rct1_ride * src)
memset(dst, 0, sizeof(rct_ride));
dst->type = RCT1::GetRideType(src->type);
dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
if (RCT1::RideTypeHasVehicle(src->type))
{
dst->subtype = _rideTypeToRideEntryMap[src->type];
}
else
{
dst->subtype = _vehicleTypeToRideEntryMap[src->vehicle_type];
}
rct_ride_entry * rideEntry = get_ride_entry(dst->subtype);
@@ -1263,8 +1270,8 @@ void S4Importer::FixMapElementEntryTypes()
mapElement->properties.fence.type = _wallTypeToEntryMap[mapElement->properties.fence.type];
if (mapElement->properties.fence.type == 255)
{
map_element_remove(mapElement);
map_element_iterator_restart_for_tile(&it);
// map_element_remove(mapElement);
// map_element_iterator_restart_for_tile(&it);
}
break;
}