Fix: [AI/GS] AreWaterTilesConnected wasn't handling aqueducts properly #8074
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
|
This bug is missing a root cause analysis. The real issue seems to be, that the direction passed to GetTileTrackStatus needs an additional GetReverseDiagDir, since GetTileTrackStatus expects an exitdir, while to_other_tile seems to be an enterdir. |
frosch123
requested changes
Apr 13, 2020
src/script/api/script_marine.cpp
Outdated
| @@ -62,13 +63,20 @@ | |||
| DiagDirection to_other_tile = ::DiagdirBetweenTiles(t2, t1); | |||
|
|
|||
| /* Determine the reachable tracks from the shared edge */ | |||
| TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile); | |||
| TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, INVALID_DIAGDIR)) & ::DiagdirReachesTracks(to_other_tile); | |||
SamuXarick
force-pushed
the
aqueduct-connection-errors
branch
from
c5d33e1
to
03c4fed
Compare
SamuXarick
force-pushed
the
aqueduct-connection-errors
branch
from
03c4fed
to
b42ebb4
Compare
frosch123
approved these changes
Apr 16, 2020
|
Maybe you also want to check the same for roads and rails. |
frosch123
added
the
backport requested
LordAro
pushed a commit
to LordAro/OpenTTD
that referenced
this pull request
May 10, 2020
LordAro
pushed a commit
that referenced
this pull request
Jun 1, 2020
LordAro
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.
PR 8074 test AI.zip
aqueduct scenario.zip
There are 2 bugs being fixed. I have attached a scenario and an AI that must run with each other.
Bug 1: As an example, tiles 1700 and 1764 are connected, but AreWaterTilesConnected reports that they're not. There are others similar tiles that fall into the same bug.
Bug 2: As an example, tiles 2032 and 2096 aren't connected, but AreWaterTilesConnected reports that they are.
This PR attempts to fix those cases while still maintaining the results the same for the other test cases. I'm sure I didn't handle all the possible cases, but I hope the fixes don't break anything.