Fix OpenRCT2#7462: Window going out of focus on spiral slide

duncanspumpkin · Jul 1, 2018 · 360715d · 360715d
1 parent ffc2854
commit 360715d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
@@ -741,7 +741,7 @@ void window_guest_viewport_init(rct_window* w){
     if (w->viewport){
         // Check all combos, for now skipping y and rot
         if (focus.coordinate.x == w->viewport_focus_coordinates.x &&
-            focus.coordinate.y == w->viewport_focus_coordinates.y &&
+            (focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK) == w->viewport_focus_coordinates.y &&
             focus.coordinate.z == w->viewport_focus_coordinates.z &&
             focus.coordinate.rotation == w->viewport_focus_coordinates.rotation)
             return;
@@ -773,7 +773,7 @@ void window_guest_viewport_init(rct_window* w){
             int32_t width = view_widget->right - view_widget->left - 1;
             int32_t height = view_widget->bottom - view_widget->top - 1;
 
-            viewport_create(w, x, y, width, height, 0, focus.coordinate.x, focus.coordinate.y, focus.coordinate.z, focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
+            viewport_create(w, x, y, width, height, 0, focus.coordinate.x, focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK, focus.coordinate.z, focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
             w->flags |= WF_NO_SCROLLING;
             window_invalidate(w);
         }

diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
@@ -1865,7 +1865,7 @@ static void window_ride_init_viewport(rct_window *w)
 
     if (w->viewport != nullptr) {
         if (focus.coordinate.x == w->viewport_focus_coordinates.x &&
-            focus.coordinate.y == w->viewport_focus_coordinates.y &&
+            (focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK) == w->viewport_focus_coordinates.y &&
             focus.coordinate.z == w->viewport_focus_coordinates.z &&
             focus.coordinate.rotation == w->viewport_focus_coordinates.rotation &&
             focus.coordinate.zoom == w->viewport_focus_coordinates.zoom &&