Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #8119: Update docking area when clearing a shore rail tile #8130

Merged
merged 1 commit into from May 10, 2020

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented May 9, 2020

No description provided.

@glx22 glx22 added the backport requested This PR should be backport to current release (RC / stable) label May 9, 2020
Copy link
Member

@frosch123 frosch123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code should be added to DoClearSquare(). Not here.

@glx22
Copy link
Contributor Author

glx22 commented May 10, 2020

It's done as in ClearTile_Water(), and I think it's the right place to do it.
If it was in DoClearSquare(), with a huge multi dock station and as it's called before any tile modification, it could remove the docking tile (and then re-scan all the station's area to re-add other docking tiles) for an action that finally re-adds the removed docking tile because it was just a temporary effect.

BTW, I checked all SetDockingTile(t, false) calls and they are ok, because they're always a CMD_LANDSCAPE_CLEAR command executed before them, taking care of removing docking tiles if needed.

@LordAro LordAro merged commit 39092ee into OpenTTD:master May 10, 2020
@glx22 glx22 deleted the fix_8119 branch May 10, 2020 19:52
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Jul 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants