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

Prefer std::optional over LOCATION_NULL on Viewport (#10297)

Browse Source
This commit is contained in:
Tulio Leao
2019-11-29 13:17:01 -03:00
committed by Michael Steenbeek
parent 7e96ddf1d6
commit 4537c061d9
9 changed files with 161 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -915,11 +915,12 @@ void window_rotate_camera(rct_window* w, int32_t direction)
// has something to do with checking if middle of the viewport is obstructed
rct_viewport* other;
CoordsXYZ coords{ screen_get_map_xy({ x, y }, &other), 0 };
auto mapXYCoords = screen_get_map_xy({ x, y }, &other);
CoordsXYZ coords{};
// other != viewport probably triggers on viewports in ride or guest window?
// x is LOCATION_NULL if middle of viewport is obstructed by another window?
if (coords.x == LOCATION_NULL || other != viewport)
// naoXYCoords is nullopt if middle of viewport is obstructed by another window?
if (!mapXYCoords || other != viewport)
{
int16_t view_x = (viewport->view_width >> 1) + viewport->view_x;
int16_t view_y = (viewport->view_height >> 1) + viewport->view_y;
@@ -928,6 +929,8 @@ void window_rotate_camera(rct_window* w, int32_t direction)
}
else
{
coords.x = mapXYCoords->x;
coords.y = mapXYCoords->y;
coords.z = tile_element_height(coords);
}