Fix: Desync after house replacement #8151
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
ldpl
force-pushed
the
house-rebuild-desync
branch
2 times, most recently
from
20d6772
to
62123f4
Compare
LordAro
reviewed
May 16, 2020
|
@LordAro what do you mean? It handles house replacement correctly by moving RemoveNearbyStations to ClearTownHouse so it gets updated every time house is removed (new houses are already updating it). Instead of trying to handle all the building size and location changes after house rebuilding. |
|
That's exactly what I mean ;) |
ldpl
force-pushed
the
house-rebuild-desync
branch
2 times, most recently
from
a1155c4
to
a4e545b
Compare
ldpl
force-pushed
the
house-rebuild-desync
branch
from
a4e545b
to
bc45a7e
Compare
LordAro
approved these changes
May 17, 2020
LordAro
added
the
backport requested
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.
Digging through #7603 (comment). This fixes the desync that happens in Town::stations_near after the town replaces a house in 1.10.1 and master(83cd040).
Steps to reproduce (in master): run with -d desync=2, load attached save, unpause.
house-replacement-acceptance-desync.zip
Unlike JGRennison/OpenTTD-patches@326dfd3 this fix also handles the case when house was relocated.
Also improved the performance of RemoveNearbyStations as it's now called more often.