From eb3f3edc1b5bccd1837d25d4d91109f89799b211 Mon Sep 17 00:00:00 2001
From: Duncan <duncans_pumpkin@hotmail.co.uk>
Date: Tue, 6 Oct 2020 10:27:56 +0100
Subject: [PATCH] Use RemoveViewport helper function (#13104)

---
 src/openrct2-ui/windows/Finances.cpp |  6 +-----
 src/openrct2-ui/windows/Guest.cpp    | 10 ++--------
 src/openrct2-ui/windows/MapGen.cpp   |  6 +-----
 src/openrct2-ui/windows/Park.cpp     | 13 +++----------
 src/openrct2-ui/windows/Player.cpp   |  6 +-----
 src/openrct2-ui/windows/Research.cpp |  6 +-----
 src/openrct2-ui/windows/Ride.cpp     |  9 ++-------
 src/openrct2-ui/windows/Staff.cpp    | 10 ++--------
 src/openrct2/interface/Window.cpp    |  6 +-----
 9 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
index 8daefc6024..0c8e810cb8 100644
--- a/src/openrct2-ui/windows/Finances.cpp
+++ b/src/openrct2-ui/windows/Finances.cpp
@@ -1312,11 +1312,7 @@ static void window_finances_set_page(rct_window* w, int32_t page)
 {
     w->page = page;
     w->frame_no = 0;
-    if (w->viewport != nullptr)
-    {
-        w->viewport->width = 0;
-        w->viewport = nullptr;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = WindowFinancesPageEnabledWidgets[page];
     w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[page];
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index a894b173a3..897e514f8d 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -642,12 +642,7 @@ void window_guest_set_page(rct_window* w, int32_t page)
     w->no_list_items = 0;
     w->selected_list_item = -1;
 
-    rct_viewport* viewport = w->viewport;
-    w->viewport = nullptr;
-    if (viewport)
-    {
-        viewport->width = 0;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = window_guest_page_enabled_widgets[page];
     w->hold_down_widgets = 0;
@@ -700,8 +695,7 @@ void window_guest_viewport_init(rct_window* w)
         origViewportFlags = w->viewport->flags;
 
         reCreateViewport = true;
-        w->viewport->width = 0;
-        w->viewport = nullptr;
+        w->RemoveViewport();
     }
 
     window_event_invalidate_call(w);
diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp
index 4edc937aaa..837a2a9224 100644
--- a/src/openrct2-ui/windows/MapGen.cpp
+++ b/src/openrct2-ui/windows/MapGen.cpp
@@ -1262,11 +1262,7 @@ static void window_mapgen_set_page(rct_window* w, int32_t page)
 {
     w->page = page;
     w->frame_no = 0;
-    if (w->viewport != nullptr)
-    {
-        w->viewport->width = 0;
-        w->viewport = nullptr;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = PageEnabledWidgets[page];
     w->hold_down_widgets = HoldDownWidgets[page];
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index 6d7262da17..2e01a4138e 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -740,7 +740,6 @@ static void window_park_init_viewport(rct_window* w)
 {
     int32_t x, y, z, r, xy, zr, viewportFlags;
     x = y = z = r = xy = zr = 0;
-    rct_viewport* viewport;
 
     if (w->page != WINDOW_PARK_PAGE_ENTRANCE)
         return;
@@ -763,10 +762,8 @@ static void window_park_init_viewport(rct_window* w)
     }
     else
     {
-        viewport = w->viewport;
-        w->viewport = nullptr;
-        viewportFlags = viewport->flags;
-        viewport->width = 0;
+        viewportFlags = w->viewport->flags;
+        w->RemoveViewport();
     }
 
     // Call invalidate event
@@ -1659,11 +1656,7 @@ static void window_park_set_page(rct_window* w, int32_t page)
     w->page = page;
     w->frame_no = 0;
     w->var_492 = 0;
-    if (w->viewport != nullptr)
-    {
-        w->viewport->width = 0;
-        w->viewport = nullptr;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = window_park_page_enabled_widgets[page];
     w->hold_down_widgets = window_park_page_hold_down_widgets[page];
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index 9c6ebe41e4..7a5b4bc517 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -561,11 +561,7 @@ static void window_player_set_page(rct_window* w, int32_t page)
     }
     else
     {
-        if (w->viewport != nullptr)
-        {
-            w->viewport->width = 0;
-            w->viewport = nullptr;
-        }
+        w->RemoveViewport();
     }
 }
 
diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp
index b0bf788ced..75c45b5922 100644
--- a/src/openrct2-ui/windows/Research.cpp
+++ b/src/openrct2-ui/windows/Research.cpp
@@ -588,11 +588,7 @@ static void window_research_set_page(rct_window* w, int32_t page)
 {
     w->page = page;
     w->frame_no = 0;
-    if (w->viewport != nullptr)
-    {
-        w->viewport->width = 0;
-        w->viewport = nullptr;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = window_research_page_enabled_widgets[page];
     w->hold_down_widgets = 0;
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 16d06ff9af..6e4f982f1c 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -1523,11 +1523,7 @@ static void window_ride_set_page(rct_window* w, int32_t page)
     // I've removed it if (page == WINDOW_RIDE_PAGE_VEHICLE) { ride_update_max_vehicles(ride);
     //}
 
-    if (w->viewport != nullptr)
-    {
-        w->viewport->width = 0;
-        w->viewport = nullptr;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = window_ride_page_enabled_widgets[page];
     w->hold_down_widgets = window_ride_page_hold_down_widgets[page];
@@ -1671,8 +1667,7 @@ static void window_ride_init_viewport(rct_window* w)
             return;
         }
         viewport_flags = w->viewport->flags;
-        w->viewport->width = 0;
-        w->viewport = nullptr;
+        w->RemoveViewport();
     }
     else if (gConfigGeneral.always_show_gridlines)
     {
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index d1f8e3228f..909f7214d6 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -366,12 +366,7 @@ void window_staff_set_page(rct_window* w, int32_t page)
     w->page = page;
     w->frame_no = 0;
 
-    rct_viewport* viewport = w->viewport;
-    w->viewport = nullptr;
-    if (viewport)
-    {
-        viewport->width = 0;
-    }
+    w->RemoveViewport();
 
     w->enabled_widgets = window_staff_page_enabled_widgets[page];
     w->hold_down_widgets = 0;
@@ -1373,8 +1368,7 @@ void window_staff_viewport_init(rct_window* w)
             return;
 
         viewport_flags = w->viewport->flags;
-        w->viewport->width = 0;
-        w->viewport = nullptr;
+        w->RemoveViewport();
     }
     else
     {
diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp
index ad8b7a6bf2..108fe3485b 100644
--- a/src/openrct2/interface/Window.cpp
+++ b/src/openrct2/interface/Window.cpp
@@ -220,11 +220,7 @@ void window_close(rct_window* w)
     window_event_close_call(window.get());
 
     // Remove viewport
-    if (window->viewport != nullptr)
-    {
-        window->viewport->width = 0;
-        window->viewport = nullptr;
-    }
+    window->RemoveViewport();
 
     // Invalidate the window (area)
     window->Invalidate();