From ddbcae801e1898e70e6fa046e1ebc9c03250cafd Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Sat, 14 Apr 2018 07:51:56 +0100 Subject: [PATCH] Use correct remove function --- src/openrct2/peep/Peep.cpp | 4 ++-- src/openrct2/ride/Ride.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 0d0d90857c..cf31bdb220 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -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); diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 3e2f75998c..87dc386be6 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -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); } }