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

Improve selecting destination station when fixing imported sprites

Browse Source
This commit is contained in:
Michał Janiszewski
2018-02-09 23:49:50 +01:00
committed by Michał Janiszewski
parent 61770b1dd7
commit 73c861ab59
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/Game.cpp
View File

@@ -45,6 +45,7 @@
#include "rct1/RCT1.h"
#include "ride/Ride.h"
#include "ride/RideRatings.h"
#include "ride/Station.h"
#include "ride/Track.h"
#include "ride/TrackDesign.h"
#include "ride/Vehicle.h"
@@ -1211,12 +1212,22 @@ void game_fix_save_vars()
peep_sort();
// Fix possibly invalid field values
FOR_ALL_PEEPS(spriteIndex, peep)
FOR_ALL_GUESTS(spriteIndex, peep)
{
if (peep->current_ride_station >= MAX_STATIONS)
{
log_warning("Peep %u has invalid ride station = %u. Resetting.", spriteIndex, peep->current_ride_station);
peep->current_ride_station = 0;
const uint8 srcStation = peep->current_ride_station;
const uint8 ride = peep->current_ride;
log_warning("Peep %u has invalid ride station = %u for ride %u.", spriteIndex, srcStation, ride);
sint8 station = ride_get_first_valid_station_exit(get_ride(ride));
if (station == -1)
{
log_warning("Couldn't find station, removing peep %u", spriteIndex);
peep_remove(peep);
} else {
log_warning("Amending ride station to %u.", station);
peep->current_ride_station = station;
}
}
}