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 #8093: Build+Refit changed game-state in command test run, and thus caused desyncs #8103

Merged
merged 3 commits into from May 3, 2020

Conversation

frosch123
Copy link
Member

Still did not test this properly :)

@frosch123 frosch123 changed the title Fix #8093: Do not call OrderBackup::Restore in the command test run, and use DC_AUTOREPLACE for actions that shall be reverted. Fix #8093: Build+Refit changed game-state in command test run, and thus caused desyncs May 1, 2020
Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

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

All my tests passed.

@LordAro
Copy link
Member

LordAro commented May 3, 2020

Needs a rebase now the ogfx change has been split out

@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label May 3, 2020
… and thus caused desyncs.

Use DC_AUTOREPLACE for actions that shall be reversibe, in this case:
- Do not rearrange free wagons in test-run.
- Do not discard OrderBackups.
The latter was not triggered by actual auto-replace, since it does not set a 'user'.
@frosch123 frosch123 merged commit 9f2e23d into OpenTTD:master May 3, 2020
@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

3 participants