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

Fix #19817: merry-go-round doesn't have a vehicle until opened (#19842)

Browse Source 
Merry-go-round doesn't receive its vehicle until it gets tested/opened,
but tries painting non-existent guests anyway, leading to reference
binding to nullptr.
This commit is contained in:
Michał Janiszewski
2023-04-06 00:55:05 +02:00
committed by GitHub
parent 1ec62e44bb
commit ee6746373e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ride/gentle/MerryGoRound.cpp
View File

@@ -92,7 +92,10 @@ static void PaintCarousel(
auto imageId = imageTemplate.WithIndex(rideEntry->Cars[0].base_image_id + imageOffset);
PaintAddImageAsParent(session, imageId, offset, bb);
PaintRiders(session, ride, *rideEntry, *vehicle, rotationOffset, offset, bb);
if (vehicle != nullptr && vehicle->num_peeps > 0)
{
PaintRiders(session, ride, *rideEntry, *vehicle, rotationOffset, offset, bb);
}
session.CurrentlyDrawnEntity = nullptr;
session.InteractionType = ViewportInteractionItem::Ride;