Fix blind throw while peeking up/downstairs #49014
Merged
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
Bugfixes "Fix blind throw while peeking up/downstairs"
Purpose of change
To fix #49009
We were only able to look around when peeking upstairs or downstairs because
game::peek()
function inCataclysm-DDA/src/game.cpp
Line 6089 in b6c4ce5
game::peek( const tripoint &p )
when a z lvl move was detected, and instead calllook_around()
with no support for peeking.Describe the solution
Remove
look_around()
handling ingame::peek()
when there is a z-lvl move, and letgame::peek( const tripoint &p )
handle this.Describe alternatives you've considered
Merging
game::peek()
andgame::peek( const tripoint &p )
Testing
Done so far :
The last two test were to make sure we can't throw at a position we should not be able to.
To do :
Additional context
I would love someone to double check I did not broke anything or/and propose more tests for me to do before this is merged.
The player avatar do weird "blink" moves during the blind throw, but they were already present before this PR. ( example, if we peek left, select blind throw, the player get back to its previous position to select the item to throw, then get teleported back to peeking position then we aim and throw )