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 #5685: Check for free wagons in ScriptVehicleList #7617

Merged
merged 1 commit into from Jul 7, 2019

Conversation

aekruijssen
Copy link
Contributor

@aekruijssen aekruijssen commented Jun 5, 2019

Fixed issue #5685 (AI: wagons lost in depot because of lack of API feature) by adding in the suggested check for free wagons in ScriptVehicleList (and importing train.h so it would work).

@aekruijssen aekruijssen changed the title Fix #5685: AI: wagons lost in depot because of lack of API feature:Added free wagon check in ScriptVehicleList Fix #5685: Check for free wagons in ScriptVehicleList Jun 5, 2019
@glx22
Copy link
Contributor

glx22 commented Jun 5, 2019

Commit checker fails on the merge commit. An easy solution is to squash all your commits in one, using git rebase -i

LordAro
LordAro previously approved these changes Jul 7, 2019
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is fine, I'm just going to squash the changes together myself

@LordAro LordAro merged commit 6f28a0c into OpenTTD:master Jul 7, 2019
@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Jul 7, 2019
michicc pushed a commit to michicc/OpenTTD that referenced this pull request Jul 7, 2019
@michicc michicc added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Jul 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants