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

Fix S4 importer

This commit is contained in:
ζeh Matt 2021-09-04 18:36:47 +03:00
parent ec65a04883
commit 078d12a207
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/rct1/S4Importer.cpp
View File

@ -716,7 +716,8 @@ namespace RCT1
{ {
if (_s4.rides[i].type != RideType::Null) if (_s4.rides[i].type != RideType::Null)
{ {
ImportRide(GetOrAllocateRide(i), &_s4.rides[i], i); const auto rideId = static_cast<ride_id_t>(i);
ImportRide(GetOrAllocateRide(rideId), &_s4.rides[i], rideId);
} }
} }
} }
@ -2482,10 +2483,12 @@ namespace RCT1
{ {
if (_s4.scenario_slot_index == SC_URBAN_PARK && _isScenario) if (_s4.scenario_slot_index == SC_URBAN_PARK && _isScenario)
{ {
const auto firstRideId = static_cast<ride_id_t>(0);
// First, make the queuing peep exit // First, make the queuing peep exit
for (auto peep : EntityList<Guest>()) for (auto peep : EntityList<Guest>())
{ {
if (peep->State == PeepState::QueuingFront && peep->CurrentRide == 0) if (peep->State == PeepState::QueuingFront && peep->CurrentRide == firstRideId)
{ {
peep->RemoveFromQueue(); peep->RemoveFromQueue();
peep->SetState(PeepState::Falling); peep->SetState(PeepState::Falling);
@ -2494,7 +2497,7 @@ namespace RCT1
} }
// Now, swap the entrance and exit. // Now, swap the entrance and exit.
auto ride = get_ride(0); auto ride = get_ride(firstRideId);
if (ride != nullptr) if (ride != nullptr)
{ {
auto entranceCoords = ride->stations[0].Exit; auto entranceCoords = ride->stations[0].Exit;
@ -2666,13 +2669,13 @@ namespace RCT1
{ {
auto* dst = CreateEntityAt<::Vehicle>(srcBase.sprite_index); auto* dst = CreateEntityAt<::Vehicle>(srcBase.sprite_index);
auto* src = static_cast<const RCT1::Vehicle*>(&srcBase); auto* src = static_cast<const RCT1::Vehicle*>(&srcBase);
const auto* ride = get_ride(src->ride); const auto* ride = get_ride(static_cast<ride_id_t>(src->ride));
if (ride == nullptr) if (ride == nullptr)
return; return;
uint8_t vehicleEntryIndex = RCT1::GetVehicleSubEntryIndex(src->vehicle_type); uint8_t vehicleEntryIndex = RCT1::GetVehicleSubEntryIndex(src->vehicle_type);
dst->ride = src->ride; dst->ride = static_cast<ride_id_t>(src->ride);
dst->ride_subtype = RCTEntryIndexToOpenRCT2EntryIndex(ride->subtype); dst->ride_subtype = RCTEntryIndexToOpenRCT2EntryIndex(ride->subtype);
dst->vehicle_type = vehicleEntryIndex; dst->vehicle_type = vehicleEntryIndex;