From 4b87f9a2e1ca6e6860189c76576aa873aa3a95c1 Mon Sep 17 00:00:00 2001
From: Trevor Finney <8711258+finneyt@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:05:37 -0500
Subject: [PATCH] Convert small scenery support flag to allow use of new colors

---
 src/openrct2/park/ParkFile.h     | 2 +-
 src/openrct2/rct1/S4Importer.cpp | 2 +-
 src/openrct2/rct2/S6Importer.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h
index 185e94ba15..53b2b148f8 100644
--- a/src/openrct2/park/ParkFile.h
+++ b/src/openrct2/park/ParkFile.h
@@ -9,7 +9,7 @@ struct ObjectRepositoryItem;
 namespace OpenRCT2
 {
     // Current version that is saved.
-    constexpr uint32_t PARK_FILE_CURRENT_VERSION = 24;
+    constexpr uint32_t PARK_FILE_CURRENT_VERSION = 25;
 
     // The minimum version that is forwards compatible with the current version.
     constexpr uint32_t PARK_FILE_MIN_VERSION = 24;
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index ec92fd7426..df502526b3 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -1706,9 +1706,9 @@ namespace RCT1
                     dst2->SetEntryIndex(entryIndex);
                     dst2->SetAge(src2->GetAge());
                     dst2->SetSceneryQuadrant(src2->GetSceneryQuadrant());
-                    dst2->SetPrimaryColour(RCT1::GetColour(src2->GetPrimaryColour()));
                     if (src2->NeedsSupports())
                         dst2->SetNeedsSupports();
+                    dst2->SetPrimaryColour(RCT1::GetColour(src2->GetPrimaryColour()) & RCT12_TILE_ELEMENT_COLOUR_MASK);
 
                     // Copied from [rct2: 0x006A2956]
                     switch (src2->GetEntryIndex())
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 97e2eaa33c..caa172a4c0 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -1484,10 +1484,10 @@ namespace RCT2
                     dst2->SetEntryIndex(src2->GetEntryIndex());
                     dst2->SetAge(src2->GetAge());
                     dst2->SetSceneryQuadrant(src2->GetSceneryQuadrant());
-                    dst2->SetPrimaryColour(src2->GetPrimaryColour());
                     dst2->SetSecondaryColour(src2->GetSecondaryColour());
                     if (src2->NeedsSupports())
                         dst2->SetNeedsSupports();
+                    dst2->SetPrimaryColour(src2->GetPrimaryColour() & RCT12_TILE_ELEMENT_COLOUR_MASK);
 
                     break;
                 }