Fix #5405: Aircraft could route to depots outside their range #7104

SamuXarick · 2019-01-25T22:19:43Z

This fix is to avoid out of range when using service at nearest hangar orders

SamuXarick · 2019-01-25T22:33:12Z

For this PR, I need a bit of help, because I'm not 100% sure if it works. Didn't test what happens when conditional orders are involved, for example.

Reference: #6925 (comment)

Savegame: https://github.com/OpenTTD/OpenTTD/files/2444256/Windside.Heath.Transport.1985-03-05.zip

just follow the helicopter complete its schedulle, it gets destination too far after order 4.

stale · 2019-03-31T15:45:39Z

This pull request has been automatically marked as stale because it has not had any activity in the last month.
Please feel free to give a status update now, ping for review, or re-open when it's ready.
It will be closed if no further activity occurs within 7 days.
Thank you for your contributions.

LordAro

I'd like someone else to check it over, but I have no issues with this in principle

src/aircraft_cmd.cpp


        Fix #5405: Aircraft could route to depots outside their range.

Determine the correct last and next destinations and then ensure these are within range of each other This fix is to avoid out of range when using service at nearest hangar orders


        Fix: No need to determine last_dest and next_dest inside the loop, as…

… they're always the same


        Fix: Simplify code readability


        Fix: indentation

outdated

LordAro changed the title ~~Fix #5405: Determine the correct last and next destinations and then ensure these are within range of each other~~ Fix #5405: Aircraft routing to depots outside their range Jan 31, 2019

LordAro changed the title ~~Fix #5405: Aircraft routing to depots outside their range~~ Fix #5405: Aircraft could route to depots outside their range Jan 31, 2019

SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch from 15ca0bb to 2e7b716 Mar 1, 2019

stale bot added the stale label Mar 31, 2019

SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch from 2e7b716 to 874e279 Apr 1, 2019

stale bot removed the stale label Apr 1, 2019

SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch 2 times, most recently from ab87207 to 100a10d Apr 11, 2019

LordAro reviewed Apr 27, 2019

View changes

LordAro requested a review from michicc Jun 23, 2019

michicc reviewed Jun 23, 2019

View changes

src/aircraft_cmd.cpp Outdated Show resolved Hide resolved

SamuXarick added 2 commits Oct 2, 2018

Fix #5405: Aircraft could route to depots outside their range.

d7bad8e

Determine the correct last and next destinations and then ensure these are within range of each other This fix is to avoid out of range when using service at nearest hangar orders

Fix: No need to determine last_dest and next_dest inside the loop, as…

Loading status checks…

dfbe6ae

… they're always the same

SamuXarick dismissed LordAro’s stale review via dfbe6ae Jul 17, 2019

SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch from 100a10d to dfbe6ae Jul 17, 2019

SamuXarick added 2 commits Jul 17, 2019

Fix: Simplify code readability

Loading status checks…

389278c

Fix: indentation

Loading status checks…

303b0fe

LordAro requested a review from michicc Aug 17, 2019

LordAro approved these changes Aug 17, 2019

View changes

OpenTTD/OpenTTD

Fix #5405: Aircraft could route to depots outside their range #7104

Fix #5405: Aircraft could route to depots outside their range #7104

SamuXarick commented Jan 25, 2019

This comment has been minimized.

SamuXarick commented Jan 25, 2019 •

edited

This comment has been minimized.

stale bot commented Mar 31, 2019

LordAro left a comment

Sponsor OpenTTD/OpenTTD

OpenTTD/OpenTTD

Join GitHub today

Fix #5405: Aircraft could route to depots outside their range #7104

Conversation

SamuXarick commented Jan 25, 2019

This comment has been minimized.

SamuXarick commented Jan 25, 2019 • edited

This comment has been minimized.

stale bot commented Mar 31, 2019

LordAro left a comment

SamuXarick commented Jan 25, 2019 •

edited