mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Refactor peep_interact_with_path to prevent null ride warnings (#8728)

Browse Source
This commit is contained in:
Ted John
2019-02-20 16:47:38 +00:00
committed by GitHub
parent 971480b305
commit 261dd32697
1 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2881,9 +2881,9 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
} }
int16_t z = tile_element->base_height * 8; int16_t z = tile_element->base_height * 8;
if (!map_is_location_owned(x, y, z)) if (map_is_location_owned(x, y, z))
{ {
if (peep->outside_of_park == 0) if (peep->outside_of_park == 1)
{ {
peep_return_to_centre_of_tile(peep); peep_return_to_centre_of_tile(peep);
return; return;
@@ -2891,7 +2891,7 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
} }
else else
{ {
if (peep->outside_of_park == 1) if (peep->outside_of_park == 0)
{ {
peep_return_to_centre_of_tile(peep); peep_return_to_centre_of_tile(peep);
return; return;
@@ -2900,9 +2900,7 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
if (peep->type == PEEP_TYPE_GUEST && tile_element->AsPath()->IsQueue()) if (peep->type == PEEP_TYPE_GUEST && tile_element->AsPath()->IsQueue())
{ {
ride_id_t rideIndex = tile_element->AsPath()->GetRideIndex(); auto rideIndex = tile_element->AsPath()->GetRideIndex();
auto ride = get_ride(rideIndex);
if (peep->state == PEEP_STATE_QUEUING) if (peep->state == PEEP_STATE_QUEUING)
{ {
// Check if this queue is connected to the ride the // Check if this queue is connected to the ride the
@@ -2911,16 +2909,18 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
if (peep->current_ride == rideIndex) if (peep->current_ride == rideIndex)
{ {
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
return;
} }
else
{
// Queue got disconnected from the original ride. // Queue got disconnected from the original ride.
peep->interaction_ride_index = 0xFF; peep->interaction_ride_index = 0xFF;
peep->RemoveFromQueue(); peep->RemoveFromQueue();
peep->SetState(PEEP_STATE_1); peep->SetState(PEEP_STATE_1);
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
return;
} }
}
else
{
// Peep is not queuing. // Peep is not queuing.
peep->time_lost = 0; peep->time_lost = 0;
uint8_t stationNum = tile_element->AsPath()->GetStationIndex(); uint8_t stationNum = tile_element->AsPath()->GetStationIndex();
@@ -2932,21 +2932,9 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
{ {
/* Peep is approaching the entrance of a ride queue. /* Peep is approaching the entrance of a ride queue.
* Decide whether to go on the ride. */ * Decide whether to go on the ride. */
if (!peep->ShouldGoOnRide(ride, stationNum, true, false)) auto ride = get_ride(rideIndex);
if (ride != nullptr && peep->ShouldGoOnRide(ride, stationNum, true, false))
{ {
// Peep has decided not to go on the ride.
peep_return_to_centre_of_tile(peep);
return;
}
}
else
{
/* Peep is approaching a queue tile without a ride
* sign facing the peep. */
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
return;
}
// Peep has decided to go on the ride at the queue. // Peep has decided to go on the ride at the queue.
peep->interaction_ride_index = rideIndex; peep->interaction_ride_index = rideIndex;
@@ -2974,13 +2962,28 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileEl
set_format_arg(8, uint32_t, ride->name_arguments); set_format_arg(8, uint32_t, ride->name_arguments);
if (gConfigNotifications.guest_queuing_for_ride) if (gConfigNotifications.guest_queuing_for_ride)
{ {
news_item_add_to_queue(NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X, peep->sprite_index); news_item_add_to_queue(
NEWS_ITEM_PEEP_ON_RIDE, STR_PEEP_TRACKING_PEEP_JOINED_QUEUE_FOR_X, peep->sprite_index);
} }
} }
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
} }
else else
{
// Peep has decided not to go on the ride.
peep_return_to_centre_of_tile(peep);
}
}
else
{
/* Peep is approaching a queue tile without a ride
* sign facing the peep. */
peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present);
}
}
}
else
{ {
peep->interaction_ride_index = 0xFF; peep->interaction_ride_index = 0xFF;
if (peep->state == PEEP_STATE_QUEUING) if (peep->state == PEEP_STATE_QUEUING)