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 #7478: Don't remove NewGRF objects on company take-over. #7483

Merged
merged 1 commit into from Apr 8, 2019

Conversation

@PeterN
Copy link
Member

PeterN commented Apr 7, 2019

Changing ownership of objects did not take account of custom objects, so treated them the same as Company HQ.

Fixes #7478.

@PeterN PeterN requested a review from LordAro Apr 8, 2019
@LordAro
LordAro approved these changes Apr 8, 2019
@PeterN PeterN merged commit 812886c into OpenTTD:master Apr 8, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190407.5 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-7478 branch Apr 8, 2019
PeterN added a commit to PeterN/OpenTTD that referenced this pull request Apr 8, 2019
PeterN added a commit that referenced this pull request Apr 8, 2019
@PeterN PeterN added backported and removed backport requested labels Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.