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 #7411: Use industry production callback (if used) on initial industry cargo generation. #7412

Merged
merged 1 commit into from Mar 25, 2019

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Mar 25, 2019

Industry production callback was not called for initial cargo generation when generating the world, so NewGRFs had to implement otherwise unused properties.

Fixes #7411

@andythenorth
Copy link
Contributor

Tested, works as expected for me.

andythenorth
andythenorth previously approved these changes Mar 25, 2019
Copy link
Contributor

@andythenorth andythenorth left a comment

Choose a reason for hiding this comment

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

Code makes sense to me.

Tested as working for both callback and non-callback case.

src/industry_cmd.cpp Outdated Show resolved Hide resolved
@PeterN PeterN merged commit a407389 into OpenTTD:master Mar 25, 2019
@PeterN PeterN deleted the fix-7411 branch March 25, 2019 19:31
@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Mar 25, 2019
TrueBrain pushed a commit to TrueBrain/OpenTTD that referenced this pull request Mar 30, 2019
@TrueBrain TrueBrain 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 Mar 30, 2019
TrueBrain pushed a commit that referenced this pull request Mar 30, 2019
douiwby pushed a commit to douiwby/OpenTTD that referenced this pull request Apr 16, 2020
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

5 participants