Fix crash on restacking inserted item #69378
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
Co-authored-by: andrei <68240139+andrei8l@users.noreply.github.com>
github-actions
bot
added
[C++]
github-actions
bot
added
astyled
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.
Summary
None
Purpose of change
Fixes #69353. andrei8l pointed out that I made an error that means inserting charged items could lose the original item on restack and crash the game.
Describe the solution
Implement andrei8l's solution of reassigning the pointer on restack.
Describe alternatives you've considered
Testing
Load Tunkhannock-trimmed.tar.gz and insert more milk in the held container. Crashes before this change, works fine after it.
Additional context