Bugfix: Prevent item deletion when dropping items #7006
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
kphoenix137
changed the title
AJenbo
reviewed
Apr 13, 2024
| WorldTilePosition &position = MyPlayer->position.tile; | ||
|
|
||
| // Common function to attempt opening based on input method. | ||
| auto attemptOpen = [&]() -> bool { |
There was a problem hiding this comment.
What need does the arrow function serve, it seems it should work the same with the code directly instead.
AJenbo
reviewed
Apr 13, 2024
| Direction dir = useCursorPosition ? GetDirection(myPlayer.position.tile, cursPosition) : myPlayer._pdir; | ||
| std::optional<Point> itemTile = FindAdjacentPositionForItem(myPlayer.position.tile, dir); | ||
|
|
||
| if (!itemTile) { |
There was a problem hiding this comment.
lets call it freeTile, avalibleTile or something like that instead.
|
This looks like a good direction to move in, but I would like to iterate over it a little bit. I dropped you some initial comments to look into. |
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.
Fixes: #6937
TryDropItem()attempted to use the future position of the player to validate the drop position of an item, which would be invalidated in certain cases inOnPutItem()which uses the player's current position. This mismatch would result in the item being removed from the player's hand, but failing to be dropped.I deduplicated and unified the logic used for handling using the mouse to drop items and other methods (Ctrl + click or non-mouse controls), and set the player's position to current position universally instead of future position. Additionally, I've given the same treatment to the logic for opening dungeons.
For the cherry on top, I removed a redundant
elseinOnPutItem()