mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix #22615: Crash when drawing Space Rings with invalid ride entry

Browse Source
This commit is contained in:
Michael Steenbeek
2024-10-15 15:50:42 +02:00
committed by GitHub
parent aea385a6ab
commit 8a9d5edc2d
2 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -1,5 +1,6 @@
0.4.16 (in development)
------------------------------------------------------------------------
- Fix: [#22615] Crash when drawing Space Rings with an invalid ride entry.
- Fix: [#22918] Zooming with keyboard moves the view off centre.
- Fix: [#22921] Wooden RollerCoaster flat to steep railings appear in front of track in front of them.
- Fix: [#22962] Fuzzy horizontal-to-vertical line transitions in charts.

69
src/openrct2/paint/track/gentle/SpaceRings.cpp
View File

@@ -42,44 +42,45 @@ static void PaintSpaceRingsStructure(
PaintSession& session, const Ride& ride, uint8_t direction, uint32_t segment, int32_t height, ImageId stationColour)
{
uint32_t vehicleIndex = (segment - direction) & 0x3;
if (ride.num_stations == 0 || vehicleIndex < ride.NumTrains)
const auto* rideEntry = GetRideEntryByIndex(ride.subtype);
if (rideEntry == nullptr || (ride.num_stations != 0 && vehicleIndex >= ride.NumTrains))
{
const auto* rideEntry = GetRideEntryByIndex(ride.subtype);
session.CurrentlyDrawnEntity = nullptr;
session.InteractionType = ViewportInteractionItem::Ride;
return;
}
int32_t frameNum = direction;
int32_t frameNum = direction;
uint32_t baseImageId = rideEntry->Cars[0].base_image_id;
auto vehicle = GetEntity<Vehicle>(ride.vehicles[vehicleIndex]);
if (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr)
{
session.InteractionType = ViewportInteractionItem::Entity;
session.CurrentlyDrawnEntity = vehicle;
frameNum += static_cast<int8_t>(vehicle->Pitch) * 4;
}
uint32_t baseImageId = rideEntry->Cars[0].base_image_id;
auto vehicle = GetEntity<Vehicle>(ride.vehicles[vehicleIndex]);
if (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && vehicle != nullptr)
if (ride.vehicleColourSettings != VehicleColourSettings::perTrain)
{
vehicleIndex = 0;
}
if (stationColour == TrackStationColour)
{
stationColour = ImageId(0, ride.vehicle_colours[vehicleIndex].Body, ride.vehicle_colours[vehicleIndex].Trim);
}
auto imageId = stationColour.WithIndex(baseImageId + frameNum);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { -10, -10, height }, { 20, 20, 23 } });
if (vehicle != nullptr && vehicle->num_peeps > 0)
{
auto* rider = GetEntity<Guest>(vehicle->peep[0]);
if (rider != nullptr)
{
session.InteractionType = ViewportInteractionItem::Entity;
session.CurrentlyDrawnEntity = vehicle;
frameNum += static_cast<int8_t>(vehicle->Pitch) * 4;
}
if (ride.vehicleColourSettings != VehicleColourSettings::perTrain)
{
vehicleIndex = 0;
}
if (stationColour == TrackStationColour)
{
stationColour = ImageId(0, ride.vehicle_colours[vehicleIndex].Body, ride.vehicle_colours[vehicleIndex].Trim);
}
auto imageId = stationColour.WithIndex(baseImageId + frameNum);
PaintAddImageAsParent(session, imageId, { 0, 0, height }, { { -10, -10, height }, { 20, 20, 23 } });
if (vehicle != nullptr && vehicle->num_peeps > 0)
{
auto* rider = GetEntity<Guest>(vehicle->peep[0]);
if (rider != nullptr)
{
stationColour = ImageId(0, rider->TshirtColour, rider->TrousersColour);
imageId = stationColour.WithIndex(baseImageId + 352 + frameNum);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { { -10, -10, height }, { 20, 20, 23 } });
}
stationColour = ImageId(0, rider->TshirtColour, rider->TrousersColour);
imageId = stationColour.WithIndex(baseImageId + 352 + frameNum);
PaintAddImageAsChild(session, imageId, { 0, 0, height }, { { -10, -10, height }, { 20, 20, 23 } });
}
}