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 #7958: Custom catenary missing on road bridges #7991

Merged
merged 2 commits into from Feb 9, 2020

Conversation

nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Feb 9, 2020

Turns out this was simply a wrong condition, used || where it should have used &&.

@nielsmh nielsmh added the backport requested This PR should be backport to current release (RC / stable) label Feb 9, 2020
src/tunnelbridge_cmd.cpp Outdated Show resolved Hide resolved
@frosch123
Copy link
Member

This is still inconsistent with road tiles.
When both road and tram have catenary, DrawRoadCatenary() draws both.
Bridges only draw one.

@nielsmh
Copy link
Contributor Author

nielsmh commented Feb 9, 2020

@frosch123 That issue seems sufficiently separate and requiring more discussion, that I'd rather leave that for another time.

Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per discussions. Consistency can be dealt with separately

@nielsmh nielsmh merged commit 45838d0 into OpenTTD:master Feb 9, 2020
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Mar 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants