Fix eating from vehicle #25017
Merged
Fix eating from vehicle #25017
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
The problem is when dragging around a shopping cart and eating some food from a non-resealable container, the game just puts the newly unsealed tin can back in the cart. Putting an opened bucket/non-resealable container back into a vehicle causes the contents to then spill. This is almost certainly not what the player wanted. This fixes the issue by using the same check used in put_into_vehicle() to put potentially spillable things into vehicles. To avoid code duplication this puts the needed functionality into its own function in the item class and refactors put_into_vehicle() to use the new function. Fixes CleverRaven#18168
src/item.cpp
Outdated
| @@ -4139,6 +4139,21 @@ const item &item::get_contained() const | |||
| return contents.front(); | |||
| } | |||
|
|
|||
| bool item::handle_spillable_contents( player &p ) | |||
| { | |||
| if( is_bucket_nonempty() && !spill_contents( p ) ) { | |||
There was a problem hiding this comment.
Excessive space before &&.
OrenAudeles
reviewed
Aug 21, 2018
src/item.cpp
Outdated
| @@ -4139,6 +4139,21 @@ const item &item::get_contained() const | |||
| return contents.front(); | |||
| } | |||
|
|
|||
| bool item::handle_spillable_contents( player &p ) | |||
There was a problem hiding this comment.
Could be made a free function bool handle_spillable_contents( player &p, item &it) since item functions is_bucket_nonempty and spill_contents are publicly accessible. This does not need to be a member function.
|
|
alanbrady
force-pushed
the
fix-soup-eating
branch
2 times, most recently
from
44f8a9d
to
e10a835
Compare
alanbrady
added a commit
to alanbrady/Cataclysm-DDA
that referenced
this pull request
Aug 24, 2018
PR CleverRaven#25017 broke using aluminum cans and caused a duplication bug when eating from tin cans from inventory. This fixes it by adjusting the placement of the call to handle_spillable_contents() to a more appropriate place in the flow of consuming an item. We also check if handle_spillable_content handled our comestible or not. If it did we need to remove it from inventory.
kevingranade
pushed a commit
that referenced
this pull request
Aug 24, 2018
PR #25017 broke using aluminum cans and caused a duplication bug when eating from tin cans from inventory. This fixes it by adjusting the placement of the call to handle_spillable_contents() to a more appropriate place in the flow of consuming an item. We also check if handle_spillable_content handled our comestible or not. If it did we need to remove it from inventory.
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.
The problem is when dragging around a shopping cart and eating some food
from a non-resealable container, the game just puts the newly unsealed
tin can back in the cart. Putting an opened bucket/non-resealable
container back into a vehicle causes the contents to then spill. This
is almost certainly not what the player wanted.
This fixes the issue by using the same check used in put_into_vehicle()
to put potentially spillable things into vehicles. To avoid code
duplication this puts the needed functionality into its own function into
pickup.h/cpp and refactors put_into_vehicle() to use the new function.
As a side affect, this fixes the player being able to have spillable buckets in
their inventory if they start as sealed and become unsealed.
A future fix should probably add the option to wield the container directly
as well.
Fixes #18168
SUMMARY: Bugfixes "Fix eating from tin cans from a vehicle"