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 #7625: Road infrastructure cost is correctly updated when upgrading your own roads. #7628

Merged

Conversation

@ddm999
Copy link
Contributor

ddm999 commented Jun 26, 2019

This fixes the road infrastructure cost issues, while still allowing the player to not have to pay maintenance on roads that are part of towns or scenarios (presumably this was the intent).

Also changes CanConvertRoadType's name to CanConvertUnownedRoadType to make more sense for what it does. The odd name choice is probably how the bug originated in the first place.

(ignore the previous commit visible in the issue which previously fixed this, which I can't get rid of because I deleted the branch - thanks GitHub)

src/road_cmd.cpp Outdated Show resolved Hide resolved
@andythenorth andythenorth added the stale label Nov 2, 2019
@andythenorth

This comment has been minimized.

Copy link
Contributor

andythenorth commented Nov 2, 2019

Thanks for this!

As there has been no activity on this PR for some, I'm proposing closing it in a few weeks if nothing more has changed, as we try to keep the PR count low. Thanks for contributing!

@LordAro LordAro added this to the 1.10.0 milestone Nov 23, 2019
@LordAro LordAro force-pushed the ddm999:fix-road-infrastructure-costs-after-conversion branch from dc392a3 to 79fa24e Dec 31, 2019
@LordAro LordAro removed the stale label Dec 31, 2019
@LordAro LordAro force-pushed the ddm999:fix-road-infrastructure-costs-after-conversion branch from 79fa24e to 60764d2 Dec 31, 2019
@LordAro LordAro merged commit 24bace3 into OpenTTD:master Dec 31, 2019
8 checks passed
8 checks passed
OpenTTD CI Build #20191231.4 succeeded
Details
OpenTTD CI (Linux commit-checker) Linux commit-checker 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

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