Cancel pick up items activity if player moves during it #34537
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
…tart of the activity, then bail out of the activity if player pos is different at the start of activity_on_turn_pickup()
ZhilkinSerg
added
<Bugfix>
mrkybe
changed the title
|
Perhaps also add a message to let the player know that the activity has canceled? |
|
So currently, the way I fixed it, autopickup will be interrupted if you move at all. So if you have a stack of rags in a cargo carrier next you, and you're driving at some speed, even though they are not moving relative to you, it will interrupt. I think this is fine, since letting go of the steering wheel causes the vehicle to turn wildly anyway and probably the player didn't actually mean "Jesus take the wheel I'm picking up rags for the next minute.". |
ZhilkinSerg
reviewed
Oct 13, 2019
| @@ -668,6 +668,15 @@ void activity_on_turn_pickup() | |||
| return; | |||
| } | |||
|
|
|||
| // If the player moves while picking up (ie: in a moving vehicle) cancel the activity, only populate coords when grabbing from the ground | |||
| if( g->u.activity.coords.size() > 0 && g->u.activity.coords.at( 0 ) != g->u.pos() ) { | |||
There was a problem hiding this comment.
g->u.activity.coords.size() > 0should be
!g->u.activity.coords.empty()
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
SUMMARY: Bugfixes "Cancel pick up items activity if player moves during it"Purpose of change
Fixes #34528, Picking up multiple items while in a moving vehicle item loss / duplication.
Describe the solution
Populate coords for activity ACT_PICKUP with player position at the start of the activity, then bail out of the activity if player pos is different at the start of activity_on_turn_pickup().
I'm not super confident in this solution and it doesn't fix drive-by-moving stuff between two vehicles.