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 #7400: WaterClass for tree tiles was not converted for old saves preventing industry creation. #7405

Merged
merged 2 commits into from Mar 24, 2019

Conversation

@PeterN
Copy link
Member

PeterN commented Mar 24, 2019

#7309 added WaterClass to tree tiles without performing any savegame conversion, causing problems for old saves. The information is easily rebuildable from the tree ground type, which this PR does on load unconditionally.

An alternative solution is to revert #7309 and explicitly test for trees with tree ground type shore. A branch with that version is https://github.com/PeterN/OpenTTD/commits/fix-7400

src/saveload/afterload.cpp Outdated Show resolved Hide resolved
@TrueBrain TrueBrain added this to the 1.9.0 milestone Mar 24, 2019
@PeterN PeterN force-pushed the PeterN:fix-7400b branch from d423418 to e14db90 Mar 24, 2019
… preventing industry creation.

As the information is always available from the tree ground type, unconditionally
update the map array for tree tiles.
@PeterN PeterN force-pushed the PeterN:fix-7400b branch from e14db90 to 0df0720 Mar 24, 2019
src/saveload/afterload.cpp Outdated Show resolved Hide resolved
@PeterN PeterN dismissed stale reviews from nielsmh and michicc via 62d4e12 Mar 24, 2019
@PeterN PeterN force-pushed the PeterN:fix-7400b branch from 0df0720 to 62d4e12 Mar 24, 2019
@PeterN PeterN merged commit f6264e5 into OpenTTD:master Mar 24, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190324.18 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:fix-7400b branch Mar 24, 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

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