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 #7371: Avoid dependency on foundations of town tile during saveload #7398

Merged
merged 1 commit into from May 11, 2019

Conversation

@nielsmh
Copy link
Contributor

nielsmh commented Mar 23, 2019

This is perhaps the simplest possible fix, but it also changes the position of town signs in some situations.

@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented Mar 23, 2019

I still think depending on anything as extensively as this before any savegame conversion has happened is asking for trouble.

@nielsmh nielsmh force-pushed the nielsmh:bug7371 branch from ca94ede to 97e92ff Apr 1, 2019
@nielsmh

This comment has been minimized.

Copy link
Contributor Author

nielsmh commented Apr 1, 2019

I prefer this solution because it does not introduce a global state for whether to use one or another algorithm, and it does not introduce a state for whether the k-d trees are valid, since they are now always valid.

@stale

This comment has been minimized.

Copy link

stale bot commented May 1, 2019

This pull request has been automatically marked as stale because it has not had any activity in the last month.
Please feel free to give a status update now, ping for review, or re-open when it's ready.
It will be closed if no further activity occurs within 7 days.
Thank you for your contributions.

@stale stale bot added the stale label May 1, 2019
@nielsmh nielsmh force-pushed the nielsmh:bug7371 branch from 97e92ff to 54b76d4 May 2, 2019
@stale stale bot removed the stale label May 2, 2019
@PeterN

This comment has been minimized.

Copy link
Member

PeterN commented May 10, 2019

Needs a rebase?

@glx22

This comment has been minimized.

Copy link
Contributor

glx22 commented May 10, 2019

Hmm yes, it's victim of the docker failure

@nielsmh nielsmh force-pushed the nielsmh:bug7371 branch from 54b76d4 to 565ff91 May 11, 2019
@PeterN
PeterN approved these changes May 11, 2019
@nielsmh nielsmh merged commit c9fe6e7 into OpenTTD:master May 11, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20190511.3 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
@nielsmh nielsmh deleted the nielsmh:bug7371 branch May 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

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