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

Move various to use CoordsXYZ funcs instead of LocationXYZ

Browse Source
This commit is contained in:
duncanspumpkin
2019-08-18 08:32:20 +01:00
parent 6da5eb9d30
commit 37ef48890f
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -808,7 +808,7 @@ rct_window* window_get_main()
*/
void window_scroll_to_location(rct_window* w, int32_t x, int32_t y, int32_t z)
{
LocationXYZ16 location_3d = { (int16_t)x, (int16_t)y, (int16_t)z };
CoordsXYZ location_3d = { x, y, z };
assert(w != nullptr);
@@ -834,7 +834,7 @@ void window_scroll_to_location(rct_window* w, int32_t x, int32_t y, int32_t z)
}
}
LocationXY16 map_coordinate = coordinate_3d_to_2d(&location_3d, get_current_rotation());
auto screenCoords = translate_3d_to_2d_with_z(get_current_rotation(), location_3d);
int32_t i = 0;
if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO))
@@ -878,8 +878,8 @@ void window_scroll_to_location(rct_window* w, int32_t x, int32_t y, int32_t z)
{
if (!(w->flags & WF_NO_SCROLLING))
{
w->saved_view_x = map_coordinate.x - (int16_t)(w->viewport->view_width * window_scroll_locations[i][0]);
w->saved_view_y = map_coordinate.y - (int16_t)(w->viewport->view_height * window_scroll_locations[i][1]);
w->saved_view_x = screenCoords.x - (int16_t)(w->viewport->view_width * window_scroll_locations[i][0]);
w->saved_view_y = screenCoords.y - (int16_t)(w->viewport->view_height * window_scroll_locations[i][1]);
w->flags |= WF_SCROLLING_TO_LOCATION;
}
}