mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10307 from tupaschoal/fix-10304 

Fix #10304: Mouse zoom not following cursor position
This commit is contained in:
Duncan 2019-11-29 22:51:58 +00:00 committed by GitHub
parent 4537c061d9 721a4961a7
commit 58948793e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/interface/Window.cpp
View File

@ -962,6 +962,8 @@ void window_viewport_get_map_coords_by_cursor(
// Compute map coordinate by mouse position.
CoordsXY mapCoords;
get_map_coordinates_from_pos({ mouse_x, mouse_y }, VIEWPORT_INTERACTION_MASK_NONE, mapCoords, nullptr, nullptr, nullptr);
*map_x = mapCoords.x;
*map_y = mapCoords.y;
// Get viewport coordinates centring around the tile.
int32_t z = tile_element_height(mapCoords);
@ -980,8 +982,6 @@ void window_viewport_get_map_coords_by_cursor(
// Compute cursor offset relative to tile.
*offset_x = (w->saved_view_x - (centreLoc->x + rebased_x)) * (1 << w->viewport->zoom);
*offset_y = (w->saved_view_y - (centreLoc->y + rebased_y)) * (1 << w->viewport->zoom);
*map_x = centreLoc->x;
*map_y = centreLoc->y;
}
void window_viewport_centre_tile_around_cursor(rct_window* w, int16_t map_x, int16_t map_y, int16_t offset_x, int16_t offset_y)