Fix #11629: AirportGetNearestTown for rotated airports #11631
Merged
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
SamuXarick
reviewed
Dec 26, 2023
src/script/api/script_airport.cpp
Outdated
| @@ -155,7 +154,7 @@ | |||
| if (!as->IsWithinMapBounds(0, tile)) return INVALID_TOWN; | |||
|
|
|||
| uint dist; | |||
| return AirportGetNearestTown(as, tile, AirportTileTableIterator(as->table[0], tile), dist)->index; | |||
| return AirportGetNearestTown(as, DIR_N, tile, AirportTileTableIterator(as->table[0], tile), dist)->index; | |||
There was a problem hiding this comment.
Correct me if I'm wrong. AIs can place rotated airports. They get a list of airport types with each type repeated 4 times, one for reach rotation. Or is that how OpenGFX+ Airports 0.5.0 coded them? What happens now when an AI tries placing an airport of one of the rotated types?
There was a problem hiding this comment.
Scripts can only build airports using the first layout for a given airport type.
I've adjusted it to use the corresponding rotation.
Add rotation parameter to AirportGetNearestTown Add wrapper for existing stations Remove unnecessary iterator cloning
JGRennison
force-pushed
the
fix-11629
branch
from
b445ab1
to
fe8ba57
Compare
rubidium42
approved these changes
Dec 28, 2023
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
Fix #11629.
Description
Add rotation parameter to AirportGetNearestTown, use for width/height assertions.
Add wrapper for existing stations, to reduce the number of parameters that need to be forwarded from struct Station/Airport.
Remove unnecessary iterator cloning.
Limitations
N/A
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.