Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

@SamuXarick
Copy link
Contributor

SamuXarick commented Jan 25, 2019

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

@SamuXarick

This comment has been minimized.

Copy link
Contributor Author

SamuXarick commented Jan 25, 2019

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.
@LordAro 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 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 SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch from 15ca0bb to 2e7b716 Mar 1, 2019
@stale

This comment has been minimized.

Copy link

stale bot commented Mar 31, 2019

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.

@stale stale bot added the stale label Mar 31, 2019
@SamuXarick SamuXarick force-pushed the SamuXarick:ensure-last-and-next-destinations-are-within-range branch from 2e7b716 to 874e279 Apr 1, 2019
@stale stale bot removed the stale label Apr 1, 2019
@SamuXarick 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
Copy link
Member

LordAro left a comment

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

@LordAro LordAro requested a review from michicc Jun 23, 2019
src/aircraft_cmd.cpp Outdated Show resolved Hide resolved
SamuXarick added 2 commits Oct 2, 2018
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
… they're always the same
@SamuXarick 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
@LordAro LordAro requested a review from michicc Aug 17, 2019
@LordAro LordAro dismissed michicc’s stale review Nov 2, 2019

outdated

@LordAro LordAro merged commit ccb4c37 into OpenTTD:master Nov 2, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190717.4 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.8) Linux linux-amd64-clang-3.8 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.