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 #184: Share townname bits when possible #185

Merged
merged 1 commit into from Jan 21, 2021
Merged

Conversation

@glx22
Copy link
Contributor

@glx22 glx22 commented Jan 21, 2021

Since #117, townname bits were not allowed to overlap. But that was extreme, as in many cases overlapping is possible.

I removed ActionF.free_bit attribute and replaced it with a deeper analyse of Action F dependencies, with updating of already prepared Action F if required.

I also added more cases to the regression test.

Copy link
Member

@LordAro LordAro left a comment

Fine by me, perhaps @Gadg8eer should test it?

@glx22 glx22 force-pushed the glx22:townnames branch from 990782f to af0e3fc Jan 21, 2021
@glx22
Copy link
Contributor Author

@glx22 glx22 commented Jan 21, 2021

I tested with his source, NFO output is the same as before #117.

@glx22 glx22 merged commit 833cf39 into OpenTTD:master Jan 21, 2021
21 checks passed
21 checks passed
Commit checker
Details
Python 3.5 on ubuntu-latest
Details
Security and Quality Security and Quality
Details
Python 3.6 on ubuntu-latest
Details
Python 3.7 on ubuntu-latest
Details
Python 3.8 on ubuntu-latest
Details
Python pypy3 on ubuntu-latest
Details
Python 3.5 on macOS-latest
Details
Python 3.6 on macOS-latest
Details
Python 3.7 on macOS-latest
Details
Python 3.8 on macOS-latest
Details
Python 3.5 on windows-2016
Details
Python 3.6 on windows-2016
Details
Python 3.7 on windows-2016
Details
Python 3.8 on windows-2016
Details
Python 3.x on ubuntu-latest
Details
Python 3.x on macOS-latest
Details
Python 3.x on windows-2016
Details
Flake8
Details
Black
Details
CodeQL No new alerts
Details
@glx22 glx22 deleted the glx22:townnames branch Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants