mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Protect ride_mechanic_status_update from null mechanic

This commit is contained in:
Ted John 2017-01-26 23:11:20 +00:00
parent 2da90b9808
commit 438926c08c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/ride/ride.c
View File

@ -2546,8 +2546,11 @@ static void ride_mechanic_status_update(sint32 rideIndex, sint32 mechanicStatus)
ride_call_closest_mechanic(rideIndex);
break;
case RIDE_MECHANIC_STATUS_HEADING:
mechanic = &(get_sprite(ride->mechanic)->peep);
if (
mechanic = NULL;
if (ride->mechanic != SPRITE_INDEX_NULL) {
mechanic = &(get_sprite(ride->mechanic)->peep);
}
if (mechanic == NULL ||
!peep_is_mechanic(mechanic) ||
(mechanic->state != PEEP_STATE_HEADING_TO_INSPECTION && mechanic->state != PEEP_STATE_ANSWERING) ||
mechanic->current_ride != rideIndex
@ -2558,8 +2561,11 @@ static void ride_mechanic_status_update(sint32 rideIndex, sint32 mechanicStatus)
}
break;
case RIDE_MECHANIC_STATUS_FIXING:
mechanic = &(get_sprite(ride->mechanic)->peep);
if (
mechanic = NULL;
if (ride->mechanic != SPRITE_INDEX_NULL) {
mechanic = &(get_sprite(ride->mechanic)->peep);
}
if (mechanic == NULL ||
!peep_is_mechanic(mechanic) ||
(
mechanic->state != PEEP_STATE_HEADING_TO_INSPECTION &&