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

Fix #2081: prevent infinite loop in ride_find_track_gap 

Adds an extra iterator that steps forward at half the speed of the
normal iterator. If they ever meet, there's a loop in the track and the
track is classified as incomplete.
This commit is contained in:
jensj12 2016-08-31 17:55:13 +02:00
parent 73d453228a
commit c7879d08cd
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ride/ride.c
View File

@ -743,7 +743,7 @@ int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output)
{
rct_window *w;
rct_ride *ride;
track_circuit_iterator it;
track_circuit_iterator it, slowIt;
int rideIndex;
rideIndex = input->element->properties.track.ride_index;
@ -756,12 +756,27 @@ int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output)
if (w != NULL && _rideConstructionState != RIDE_CONSTRUCTION_STATE_0 && _currentRideIndex == rideIndex)
sub_6C9627();
bool counter = true;
track_circuit_iterator_begin(&it, *input);
slowIt = it;
while (track_circuit_iterator_next(&it)) {
if (!track_is_connected_by_shape(it.last.element, it.current.element)) {
*output = it.current;
return 1;
}
//#2081: prevent an infinite loop
counter = !counter;
if (counter) {
track_circuit_iterator_next(&slowIt);
if (slowIt.currentZ == it.currentZ &&
slowIt.currentDirection == it.currentDirection &&
slowIt.current.x == it.current.x &&
slowIt.current.y == it.current.y) {
*output = it.current;
return 1;
}
}
}
if (!it.looped) {
*output = it.last;