mousequery map boundary detection fixes #1440
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
TWBT modifies the map dimensions, so using the window dimensions to handle edge scrolling produces the wrong behavior when using a larger map tileset than text tileset.
|
Pvt Pirate reports that this works on the forums, and I can't see any difference from the original behavior without TWBT, so I'm merging it. |
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.
This changes mousequery to use the map dimensions returned from Gui::getDwarfmodeViewDims() to determine map boundaries rather than some complicated (and inconsistent) math with other fields. Granted, mousequery predates the map_x2/y2 fields. However, TWBT breaks the old checks because it modifies the result of getMousePos() to support different map tile sizes. In the case where the map tiles are larger than the surrounding tiles, mousequery would think that the mouse wasn't close to the bottom/right edges of the map when it actually was.
This hopefully fixes some edge detection issues reported on the forums, as well as potential similar issues with other features (tracking and right-button scrolling).