Fix distributing food with empties containers #41232
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
Note that `omt_pos` is a global coordinate.
Multiple things in one commit because this is basically a complete rewrite of the existing code. The existing code doesn't handle food in containers correctly. It gets a list of pointers to the items within a container, and clears the content of that container. Now those pointers are all dangling, but they are used nonetheless. That'll cause UB. Empty containers were dropped on a special tile, with **global** coordinates (omt_pos is global). This has been fixed, but it will still teleport items randomly without any sense. Code was restructured by using lambdas to create separate parts.
…mp food Instead just keep the container where it is.
Does that make the containers disapear? |
mlangsdorf
added
Items: Containers
mlangsdorf
approved these changes
Jun 13, 2020
There was a problem hiding this comment.
I support KorGgenT's mission to get rid of auto when we know a function's return, but other than that minor quibble, this looks great. Thanks for fixing this!
If I'm reading this correctly, the containers will be left in place, because the contents are removed in consume(). Seems like a sensible solution.
Co-authored-by: Mark Langsdorf <[email protected]>
fengjixuchui
added a commit
to fengjixuchui/Cataclysm-DDA
that referenced
this pull request
Jun 13, 2020
Fix distributing food with empties containers (CleverRaven#41232)
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: NoneFixes #37149. It rewrites the whole food distributing block, and thereby also fixes #40712.
I also removed the littering feature. It would teleport empty contains on a specific area (using magic values as coordinates) with no regard for the surround (e.g. into fire, or into an enclosed area).