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 #10087: crash loading a save with corrupt peeps (#10122)

Browse Source
This commit is contained in:
ζeh Matt
2019-11-09 17:00:09 +01:00
committed by Michael Steenbeek
parent f6a23fd5f5
commit 9b499ea239
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/Game.cpp
View File

@@ -603,11 +603,18 @@ void game_fix_save_vars()
{
continue;
}
Ride* ride = get_ride(rideIdx);
if (ride == nullptr)
{
log_warning("Couldn't find ride %u, resetting ride on peep %u", rideIdx, spriteIndex);
peep->current_ride = RIDE_ID_NULL;
continue;
}
set_format_arg(0, uint32_t, peep->id);
auto curName = peep->GetName();
log_warning(
"Peep %u (%s) has invalid ride station = %u for ride %u.", spriteIndex, curName.c_str(), srcStation, rideIdx);
int8_t station = ride_get_first_valid_station_exit(get_ride(rideIdx));
int8_t station = ride_get_first_valid_station_exit(ride);
if (station == -1)
{
log_warning("Couldn't find station, removing peep %u", spriteIndex);