mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Allow building queues from raised/lowered entrances

Browse Source 
The original code assumes the entrance is at the exact same height as the
station, which is not always the case with hacked rides.
This commit is contained in:
Hielke Morsink
2018-01-13 14:27:24 +01:00
committed by Hielke Morsink
parent 97032f7044
commit 7fe50a481f
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/openrct2/world/Footpath.cpp
View File

@@ -1598,27 +1598,29 @@ void footpath_queue_chain_push(uint8 rideIndex)
*/
void footpath_update_queue_chains()
{
for (uint8 *queueChainPtr = _footpathQueueChain; queueChainPtr < _footpathQueueChainNext; queueChainPtr++) {
uint8 rideIndex = *queueChainPtr;
Ride *ride = get_ride(rideIndex);
if (ride->type == RIDE_TYPE_NULL) {
for (uint8 * queueChainPtr = _footpathQueueChain; queueChainPtr < _footpathQueueChainNext; queueChainPtr++)
{
uint8 rideIndex = *queueChainPtr;
Ride * ride = get_ride(rideIndex);
if (ride->type == RIDE_TYPE_NULL)
continue;
}
for (sint32 i = 0; i < MAX_STATIONS; i++) {
if (ride->entrances[i].xy == RCT_XY8_UNDEFINED) {
for (sint32 i = 0; i < MAX_STATIONS; i++)
{
if (ride->entrances[i].xy == RCT_XY8_UNDEFINED)
continue;
}
uint8 x = ride->entrances[i].x;
uint8 y = ride->entrances[i].y;
uint8 z = ride->station_heights[i];
rct_tile_element *tileElement = map_get_first_element_at(x, y);
do {
if (tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue;
if (tileElement->base_height != z) continue;
if (tileElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) continue;
uint8 x = ride->entrances[i].x;
uint8 y = ride->entrances[i].y;
rct_tile_element * tileElement = map_get_first_element_at(x, y);
do
{
if (tile_element_get_type(tileElement) != TILE_ELEMENT_TYPE_ENTRANCE)
continue;
if (tileElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE)
continue;
if (tileElement->properties.entrance.ride_index != rideIndex)
continue;
uint8 direction = tile_element_get_direction_with_offset(tileElement, 2);
footpath_chain_ride_queue(rideIndex, i, x << 5, y << 5, tileElement, direction);