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 e66cec8f86: Permit loading of industry production callback with invalid cargo type. #7364

Merged

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Mar 10, 2019

It is only an error if the invalid result is actually used. This will be silently ignored at the moment.

@andythenorth
Copy link
Contributor

This now loads the test grf from https://github.com/OpenTTD/nml/files/2949781/firs.grf.zip

@PeterN PeterN force-pushed the allow-invalid-industry-production-callback-result branch from 16cc29c to 836d71b Compare March 10, 2019 17:46
@PeterN PeterN added the backport requested This PR should be backport to current release (RC / stable) label Mar 10, 2019
@andythenorth
Copy link
Contributor

andythenorth commented Mar 10, 2019

Still works after force-push update.

@PeterN PeterN force-pushed the allow-invalid-industry-production-callback-result branch from 7aad949 to 55ad7d4 Compare March 10, 2019 19:28
…lid cargo type.

It is only an error if the invalid result is actually used. This will be silently ignored at the moment.
It is still an error if a duplicate cargo type is returned.
@PeterN PeterN force-pushed the allow-invalid-industry-production-callback-result branch from 55ad7d4 to b91add4 Compare March 11, 2019 20:35
@PeterN PeterN marked this pull request as ready for review March 12, 2019 11:08
@PeterN PeterN merged commit 35967ef into OpenTTD:master Mar 15, 2019
@PeterN PeterN deleted the allow-invalid-industry-production-callback-result branch March 15, 2019 17:43
@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) needs review labels Mar 23, 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