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 #7433: don't use AirportSpec substitute if it's not set #7435

Merged
merged 1 commit into from Mar 30, 2019

Conversation

@glx22
Copy link
Contributor

glx22 commented Mar 29, 2019

Maybe not the right fix, but it works.
I think subst_id can never be AT_INVALID, because default value for OverrideManagerBase::mappingID[].substitute_id is 0. But defaulting substitute_id to invalid_ID will probably need a savegame conversion, and I don't know if changing default substitute value for other managers will break stuff.

@glx22 glx22 merged commit e936305 into OpenTTD:master Mar 30, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190329.1 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 added backported and removed backport requested labels Apr 8, 2019
@glx22 glx22 deleted the glx22:fix7433 branch Apr 11, 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.