Fix: removing long roads doesn't prioritize refusal of local authority over other errors #9831
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…y over other errors
James103
reviewed
Mar 10, 2022
| @@ -1113,8 +1113,14 @@ std::tuple<CommandCost, Money> CmdRemoveLongRoad(DoCommandFlag flags, TileIndex | |||
| cost.AddCost(ret); | |||
| had_success = true; | |||
| } else { | |||
| /* Ownership errors are more important. */ | |||
| if (last_error.GetErrorMessage() != STR_ERROR_OWNED_BY) last_error = ret; | |||
| /* Some errors are more equal than others. */ | |||
There was a problem hiding this comment.
Suggested change
| /* Some errors are more equal than others. */ | |
| /* Some errors are more important than others. */ |
The word "important" describes it better than "equal".
There was a problem hiding this comment.
No. Humor is important!
There was a problem hiding this comment.
PS: I can be bought off with cookies (or beer) to give me another opinion. Just saying ;)
michicc
approved these changes
Mar 10, 2022
TrueBrain
added
the
backport requested
TrueBrain
added a commit
to TrueBrain/OpenTTD
that referenced
this pull request
Apr 2, 2022
…y over other errors (OpenTTD#9831)
TrueBrain
added a commit
to TrueBrain/OpenTTD
that referenced
this pull request
Apr 2, 2022
…y over other errors (OpenTTD#9831)
TrueBrain
added a commit
to TrueBrain/OpenTTD
that referenced
this pull request
Apr 2, 2022
…y over other errors (OpenTTD#9831)
TrueBrain
added
backported
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9820
Motivation / Problem
Some errors are more equal than others. Ownership errors already were. Now local authority errors are too. See #9820 for example.
Description
See patch. Can't explain it in more words.
Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.