mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix backwards loop in vehicle.c

This commit is contained in:
jensj12 2016-09-03 16:53:04 +02:00
parent b5456f961a
commit 5500e9e5cd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ride/vehicle.c
View File

@ -5753,7 +5753,11 @@ static void vehicle_update_block_breaks_open_previous_section(rct_vehicle *vehic
int x = vehicle->track_x;
int y = vehicle->track_y;
int z = vehicle->track_z;
track_begin_end trackBeginEnd;
track_begin_end trackBeginEnd, slowTrackBeginEnd;
rct_map_element slowMapElement = *mapElement;
bool counter = true;
int slowX = x;
int slowY = y;
do {
if (!track_block_get_previous(x, y, mapElement, &trackBeginEnd)) {
return;
@ -5768,6 +5772,21 @@ static void vehicle_update_block_breaks_open_previous_section(rct_vehicle *vehic
y = trackBeginEnd.end_y;
z = trackBeginEnd.begin_z;
mapElement = trackBeginEnd.begin_element;
//#2081: prevent infinite loop
counter = !counter;
if (counter) {
track_block_get_previous(slowX, slowY, &slowMapElement, &slowTrackBeginEnd);
slowX = slowTrackBeginEnd.end_x;
slowY = slowTrackBeginEnd.end_y;
slowMapElement = *(slowTrackBeginEnd.begin_element);
if (slowX == x &&
slowY == y &&
slowMapElement.base_height == mapElement->base_height &&
slowMapElement.type == mapElement->type ) {
return;
}
}
} while (!track_element_is_block_start(trackBeginEnd.begin_element));
// Get the start of the track block instead of the end