Add: Road waypoints #12572
Open
Add: Road waypoints #12572
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
JGRennison
force-pushed
the
road-waypoints
branch
from
5696fe1
to
2e20275
Compare
2TallTyler
reviewed
Apr 28, 2024
JGRennison
force-pushed
the
road-waypoints
branch
2 times, most recently
from
9087751
to
b3408bf
Compare
rubidium42
reviewed
May 2, 2024
There was a problem hiding this comment.
Looks like the last commit is going to conflict with #12595.
src/station_cmd.cpp
Outdated
| if (ret.Failed()) return ret; | ||
| } | ||
|
|
||
| /* don't do the check for drive-through road stops when company bankrupts */ |
There was a problem hiding this comment.
Suggested change
| /* don't do the check for drive-through road stops when company bankrupts */ | |
| /* Ignore vehicles when the company bankrupts. The road will remain, any vehicles going to the waypoint will be removed. */ |
src/station_cmd.cpp
Outdated
Comment on lines
4661
to
4664
| if (IsDriveThroughStopTile(tile)) { | ||
| CommandCost remove_road = CanRemoveRoadWithStop(tile, flags); | ||
| if (remove_road.Failed()) return remove_road; | ||
| } |
There was a problem hiding this comment.
I think this is a copy-paste mistake. Why would road waypoints also be drive through stops?
There was a problem hiding this comment.
Yes, the condition is redundant here as all road waypoints are drive-through. (Bay waypoints would be a bit useless).
I'll fix this later,
If that is merged first then I'll redo the UI stuff accordingly at some point. |
Move can station have wires bit to make room
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.
Motivation / Problem
Add road waypoints, and corresponding NewGRF support: action 5 and custom road stops via feature 0x14
Description
Add road waypoint functionality, road waypoint default graphics, custom road waypoint GRF support, road waypoint selection window. Adjust map bit allocations as required.
For testing, the existing GRF on bananas: Road Stops & No Waypoints has waypoints, despite the name. With this PR applied the road waypoint part of this GRF "just works" as expected.
Limitations
For lack of a better choice, road waypoints use the PR_BUILD_STATION_TRUCK and PR_CLEAR_STATION_TRUCK basecost categories. Adding more basecost categories seems unnecessarily disruptive to basecost GRFs/the spec.
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.