From 9b5e8140f9c5c68957ccb87ff332eb87d5faba20 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 13 Mar 2020 10:35:03 +0100 Subject: [PATCH] Fix #10919: Crash when assertion fails in heavily damaged park (#10921) --- src/openrct2/peep/Guest.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index f41dc3dcab..5e167e269c 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -2511,7 +2511,11 @@ static void peep_choose_seat_from_car(Peep* peep, Ride* ride, Vehicle* vehicle) static void peep_go_to_ride_entrance(Guest* peep, Ride* ride) { TileCoordsXYZD location = ride_get_entrance_location(ride, peep->current_ride_station); - Guard::Assert(!location.isNull()); + if (location.isNull()) + { + peep->RemoveFromQueue(); + return; + } int32_t x = location.x; int32_t y = location.y;