bugfix(saveload): Restore dock approach position reached flags on load - #3117
Draft
bobtista wants to merge 2 commits into
Draft
bugfix(saveload): Restore dock approach position reached flags on load#3117bobtista wants to merge 2 commits into
bobtista wants to merge 2 commits into
Conversation
This file contains hidden or 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
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.
DockUpdate::xferreads eachm_approachPositionReachedentry into a localBooland passes its address toxferBool.BoolVectorisstd::vector<bool>, whoseoperator[]returns a proxy rather than a reference, so on load the value is written into the local and discarded and the vector keeps thefalseentries left byresize().m_approachPositionOwnersis restored correctly, so after loading the dock still holds its approach slots while every reached flag reads false.isClearToAdvancenever returns true andDockUpdate::updatenever finds a position to promote tom_activeDocker, and the flags are only set byonApproachReached, which fires fromAIDockApproachState::onExitand will not fire again for a unit that is already waiting.Now the unpacked value is written back into the vector after the xfer, so the reached flags survive a save and load and the queue keeps running. This does not change the save layout, so existing saves still load.
Measured on MD_CHI01 by saving on the frame a docker reaches its approach position and loading the save back, logging the dock module's state on both sides of the xfer.
reachedis them_approachPositionReachedbit vector andownersthe matchingm_approachPositionOwnersentries, for the supply centre holding docker 602:The docker keeps its reserved slot across the load either way. Before the fix its reached flag is lost, which is the state that stalls the queue; after the fix the flags round-trip unchanged.
Todo: