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 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

andythenorth commented Mar 10, 2019

@PeterN PeterN force-pushed the PeterN:allow-invalid-industry-production-callback-result branch from 16cc29c to 836d71b Mar 10, 2019
@andythenorth
Copy link
Contributor

andythenorth commented Mar 10, 2019

Still works after force-push update.

@PeterN PeterN force-pushed the PeterN:allow-invalid-industry-production-callback-result branch from 7aad949 to 55ad7d4 Mar 10, 2019
PeterN added 2 commits Mar 10, 2019
…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 PeterN:allow-invalid-industry-production-callback-result branch from 55ad7d4 to b91add4 Mar 11, 2019
@PeterN PeterN marked this pull request as ready for review Mar 12, 2019
@PeterN PeterN added the needs review label Mar 13, 2019
@PeterN PeterN merged commit 35967ef into OpenTTD:master Mar 15, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190311.17 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
@PeterN PeterN deleted the PeterN:allow-invalid-industry-production-callback-result branch Mar 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.