From a8eb6f21a26dfd23f23d8f5678aa6f17935ff59b Mon Sep 17 00:00:00 2001
From: Ryan <rctdude2@gmail.com>
Date: Mon, 4 Apr 2022 01:02:48 -0400
Subject: [PATCH 1/2] Fix scenery window colors defaulting to black

---
 src/openrct2-ui/windows/Scenery.cpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 5703f9cdc2..8359cc76c0 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -830,19 +830,6 @@ public:
         window_invalidate_by_class(WC_SCENERY);
     }
 
-    void SetDefaultPlacementConfiguration()
-    {
-        gWindowSceneryRotation = 3;
-        gWindowSceneryPrimaryColour = COLOUR_BORDEAUX_RED;
-        gWindowScenerySecondaryColour = COLOUR_YELLOW;
-        gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
-
-        Init();
-
-        gWindowSceneryTabSelections.clear();
-        gWindowSceneryActiveTabIndex = 0;
-    }
-
 private:
     int32_t GetNumColumns() const
     {
@@ -1394,11 +1381,19 @@ void WindowSceneryResetSelectedSceneryItems()
 
 void WindowScenerySetDefaultPlacementConfiguration()
 {
+    gWindowSceneryRotation = 3;
+    gWindowSceneryPrimaryColour = COLOUR_BORDEAUX_RED;
+    gWindowScenerySecondaryColour = COLOUR_YELLOW;
+    gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
+
     auto* w = static_cast<SceneryWindow*>(window_find_by_class(WC_SCENERY));
     if (w != nullptr)
     {
-        w->SetDefaultPlacementConfiguration();
+        w->Init();
     }
+
+    gWindowSceneryTabSelections.clear();
+    gWindowSceneryActiveTabIndex = 0;
 }
 
 void WindowSceneryInit()

From 42dc53cfd569141968437269e26dabf884f907ca Mon Sep 17 00:00:00 2001
From: Ryan <rctdude2@gmail.com>
Date: Mon, 4 Apr 2022 12:53:50 -0400
Subject: [PATCH 2/2] Remove unused call to Init

---
 src/openrct2-ui/windows/Scenery.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 8359cc76c0..1607b4255d 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -1386,12 +1386,6 @@ void WindowScenerySetDefaultPlacementConfiguration()
     gWindowScenerySecondaryColour = COLOUR_YELLOW;
     gWindowSceneryTertiaryColour = COLOUR_DARK_BROWN;
 
-    auto* w = static_cast<SceneryWindow*>(window_find_by_class(WC_SCENERY));
-    if (w != nullptr)
-    {
-        w->Init();
-    }
-
     gWindowSceneryTabSelections.clear();
     gWindowSceneryActiveTabIndex = 0;
 }