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

Use correct remove function

Browse Source
This commit is contained in:
duncanspumpkin
2018-04-14 07:51:56 +01:00
parent e5d4c39d4a
commit ddbcae801e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/peep/Peep.cpp
View File

@@ -2940,7 +2940,7 @@ static void peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_til
}
// Queue got disconnected from the original ride.
peep->interaction_ride_index = 0xFF;
peep->RemoveFromRide();
peep->RemoveFromQueue();
peep->SetState(PEEP_STATE_1);
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
return;
@@ -3011,7 +3011,7 @@ static void peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_til
peep->interaction_ride_index = 0xFF;
if (peep->state == PEEP_STATE_QUEUING)
{
peep->RemoveFromRide();
peep->RemoveFromQueue();
peep->SetState(PEEP_STATE_1);
}
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);

4
src/openrct2/ride/Ride.cpp
View File

@@ -1170,7 +1170,7 @@ void ride_remove_peeps(sint32 rideIndex)
peep_decrement_num_riders(peep);
if (peep->state == PEEP_STATE_QUEUING_FRONT && peep->sub_state == PEEP_RIDE_AT_ENTRANCE)
peep->RemoveFromRide();
peep->RemoveFromQueue();
peep->Invalidate();
@@ -5617,7 +5617,7 @@ void ride_stop_peeps_queuing(sint32 rideIndex)
if (peep->current_ride != rideIndex)
continue;
peep->RemoveFromRide();
peep->RemoveFromQueue();
peep->SetState(PEEP_STATE_FALLING);
}
}