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

Fix #8426: Queue banner left behind after ride demolition

Browse Source
This commit is contained in:
Michael Steenbeek
2018-12-22 15:34:17 +01:00
committed by GitHub
parent 958f287bb7
commit 2530cd1ac3
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/openrct2/actions/RideDemolishAction.hpp
View File

@@ -126,6 +126,7 @@ private:
ride_stop_peeps_queuing(_rideIndex);
sub_6CB945(_rideIndex);
ride_clear_leftover_entrances(_rideIndex);
news_item_disable_news(NEWS_ITEM_RIDE, _rideIndex);
for (auto& banner : gBanners)
@@ -150,7 +151,7 @@ private:
{
if (peep->current_ride == _rideIndex)
{
peep->current_ride = MAX_RIDES;
peep->current_ride = RIDE_ID_NULL;
if (peep->time_to_stand >= 50)
{
// make peep stop watching the ride
@@ -200,11 +201,11 @@ private:
if (peep->guest_heading_to_ride_id == _rideIndex)
{
peep->guest_heading_to_ride_id = MAX_RIDES;
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
}
if (peep->favourite_ride == _rideIndex)
{
peep->favourite_ride = MAX_RIDES;
peep->favourite_ride = RIDE_ID_NULL;
}
for (int32_t i = 0; i < PEEP_MAX_THOUGHTS; i++)
@@ -288,24 +289,7 @@ private:
tile_element_iterator_begin(&it);
while (tile_element_iterator_next(&it))
{
uint8_t tile_type = it.element->GetType();
if (tile_type == TILE_ELEMENT_TYPE_ENTRANCE)
{
uint8_t type = it.element->AsEntrance()->GetEntranceType();
if (type == ENTRANCE_TYPE_PARK_ENTRANCE)
continue;
if (it.element->AsEntrance()->GetRideIndex() == _rideIndex)
{
tile_element_remove(it.element);
tile_element_iterator_restart_for_tile(&it);
}
continue;
}
if (tile_type != TILE_ELEMENT_TYPE_TRACK)
if (it.element->GetType() != TILE_ELEMENT_TYPE_TRACK)
continue;
if (it.element->AsTrack()->GetRideIndex() != _rideIndex)

2
src/openrct2/network/Network.cpp
View File

@@ -30,7 +30,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "17"
#define NETWORK_STREAM_VERSION "18"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static rct_peep* _pickup_peep = nullptr;

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

@@ -8990,3 +8990,20 @@ void determine_ride_entrance_and_exit_locations()
}
}
}
void ride_clear_leftover_entrances(uint8_t rideIndex)
{
tile_element_iterator it;
tile_element_iterator_begin(&it);
while (tile_element_iterator_next(&it))
{
if (it.element->GetType() == TILE_ELEMENT_TYPE_ENTRANCE
&& it.element->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_PARK_ENTRANCE
&& it.element->AsEntrance()->GetRideIndex() == rideIndex)
{
tile_element_remove(it.element);
tile_element_iterator_restart_for_tile(&it);
}
}
}

1
src/openrct2/ride/Ride.h
View File

@@ -1195,5 +1195,6 @@ void ride_stop_peeps_queuing(int32_t rideIndex);
LocationXY16 ride_get_rotated_coords(int16_t x, int16_t y, int16_t z);
void determine_ride_entrance_and_exit_locations();
void ride_clear_leftover_entrances(uint8_t rideIndex);
#endif