mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Adjust importer/exporter

Browse Source
This commit is contained in:
ZehMatt
2021-08-02 09:09:51 +03:00
committed by ζeh Matt
parent ca605d6f82
commit 18fa68813d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -609,7 +609,7 @@ void S6Exporter::ExportRides()
const Ride nullRide{};
for (int32_t index = 0; index < RCT12_MAX_RIDES_IN_PARK; index++)
{
const auto* src = get_ride(index);
const auto* src = get_ride(static_cast<ride_id_t>(index));
if (src == nullptr)
{
src = &nullRide;
@@ -931,9 +931,9 @@ void S6Exporter::ExportRideMeasurements()
{
// Get all the ride measurements
std::vector<Ride*> ridesWithMeasurements;
for (ride_id_t i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++)
for (size_t i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++)
{
auto ride = get_ride(i);
auto ride = get_ride(static_cast<ride_id_t>(i));
if (ride != nullptr && ride->measurement != nullptr)
{
ridesWithMeasurements.push_back(ride);
@@ -958,8 +958,8 @@ void S6Exporter::ExportRideMeasurements()
ExportRideMeasurement(_s6.ride_measurements[i], *src->measurement.get());
auto rideId = src->id;
dst.ride_index = rideId;
_s6.rides[rideId].measurement_index = i;
dst.ride_index = static_cast<uint8_t>(rideId);
_s6.rides[static_cast<uint8_t>(rideId)].measurement_index = i;
i++;
}
}
@@ -1224,7 +1224,7 @@ template<> void S6Exporter::ExportEntity(RCT2SpriteVehicle* dst, const Vehicle*
dst->remaining_distance = src->remaining_distance;
dst->velocity = src->velocity;
dst->acceleration = src->acceleration;
dst->ride = src->ride;
dst->ride = static_cast<uint8_t>(src->ride);
dst->vehicle_type = src->vehicle_type;
dst->colours = src->colours;
dst->track_progress = src->track_progress;
@@ -1840,7 +1840,7 @@ void S6Exporter::ExportTileElement(RCT12TileElement* dst, const TileElement* src
// Skipping IsHighlighted()
// This has to be done last, since the maze entry shares fields with the colour and sequence fields.
auto ride = get_ride(dst2->GetRideIndex());
auto ride = get_ride(static_cast<ride_id_t>(dst2->GetRideIndex()));
if (ride)
{
if (ride->type == RIDE_TYPE_MAZE)

12
src/openrct2/rct2/S6Importer.cpp
View File

@@ -530,8 +530,9 @@ public:
auto src = &_s6.rides[index];
if (src->type != RIDE_TYPE_NULL)
{
auto dst = GetOrAllocateRide(index);
ImportRide(dst, src, index);
const auto rideId = static_cast<ride_id_t>(index);
auto dst = GetOrAllocateRide(rideId);
ImportRide(dst, src, rideId);
}
}
}
@@ -872,7 +873,8 @@ public:
{
if (src.ride_index != RCT12_RIDE_ID_NULL)
{
auto ride = get_ride(src.ride_index);
const auto rideId = static_cast<ride_id_t>(src.ride_index);
auto ride = get_ride(rideId);
if (ride != nullptr)
{
ride->measurement = std::make_unique<RideMeasurement>();
@@ -1061,7 +1063,7 @@ public:
{
if (sprite.unknown.sprite_identifier == RCT12SpriteIdentifier::Peep)
{
if (sprite.peep.current_ride == rideIndex
if (sprite.peep.current_ride == static_cast<RCT12RideId>(rideIndex)
&& (static_cast<PeepState>(sprite.peep.state) == PeepState::OnRide
|| static_cast<PeepState>(sprite.peep.state) == PeepState::EnteringRide))
{
@@ -1597,7 +1599,7 @@ template<> void S6Importer::ImportEntity<Vehicle>(const RCT12SpriteBase& baseSrc
dst->remaining_distance = src->remaining_distance;
dst->velocity = src->velocity;
dst->acceleration = src->acceleration;
dst->ride = src->ride;
dst->ride = static_cast<ride_id_t>(src->ride);
dst->vehicle_type = src->vehicle_type;
dst->colours = src->colours;
dst->track_progress = src->track_progress;