mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Code Issues Releases Wiki Activity

Merge pull request #10285 from tupaschoal/useCoords-get-map-coords

Browse Source 
Remove raw coordinates overload of get_map_coordinates_from_pos
This commit is contained in:
Duncan
2019-11-29 09:20:12 +00:00
committed by GitHub
parent 91df8358a1 47935288d0
commit b316f447a4
14 changed files with 92 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -957,12 +957,13 @@ void window_viewport_get_map_coords_by_cursor(
context_get_cursor_position_scaled(&mouse_x, &mouse_y);
// Compute map coordinate by mouse position.
get_map_coordinates_from_pos(mouse_x, mouse_y, VIEWPORT_INTERACTION_MASK_NONE, map_x, map_y, nullptr, nullptr, nullptr);
CoordsXY mapCoords;
get_map_coordinates_from_pos({ mouse_x, mouse_y }, VIEWPORT_INTERACTION_MASK_NONE, mapCoords, nullptr, nullptr, nullptr);
// Get viewport coordinates centring around the tile.
int32_t z = tile_element_height({ *map_x, *map_y });
int32_t z = tile_element_height(mapCoords);
auto centreLoc = centre_2d_coordinates({ *map_x, *map_y, z }, w->viewport);
auto centreLoc = centre_2d_coordinates({ mapCoords.x, mapCoords.y, z }, w->viewport);
if (!centreLoc)
{
log_error("Invalid location.");
@@ -976,6 +977,8 @@ 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)