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 force-pushed the nielsmh:fix-7958 branch from 5eaafd8 to 4758f7a Feb 9, 2020
src/tunnelbridge_cmd.cpp Outdated Show resolved Hide resolved
@nielsmh nielsmh force-pushed the nielsmh:fix-7958 branch from 4758f7a to 41984ce Feb 9, 2020
@nielsmh nielsmh force-pushed the nielsmh:fix-7958 branch from 41984ce to f72f1ef Feb 9, 2020
@frosch123
Copy link
Member

@frosch123 frosch123 commented Feb 9, 2020

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 nielsmh commented Feb 9, 2020

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

@LordAro
LordAro approved these changes Feb 9, 2020
Copy link
Member

@LordAro LordAro left a comment

As per discussions. Consistency can be dealt with separately

@nielsmh nielsmh merged commit 45838d0 into OpenTTD:master Feb 9, 2020
8 checks passed
8 checks passed
Commit checker
Details
OpenTTD CI Build #20200209.14 succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 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
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.