From b5a4aa30cc76a54903787281b7c4cbd586c97887 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Fri, 24 Nov 2017 13:17:25 +0100
Subject: [PATCH] Add TT's tile roofs to R&W tab, add TT's wooden roofs to Mine
 theming

---
 src/openrct2/object/SmallSceneryObject.cpp | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp
index 4401ce40db..e101c08aba 100644
--- a/src/openrct2/object/SmallSceneryObject.cpp
+++ b/src/openrct2/object/SmallSceneryObject.cpp
@@ -158,6 +158,7 @@ uint8 * SmallSceneryObject::ReadFrameOffsets(IStream * stream)
 void SmallSceneryObject::PerformFixes()
 {
     std::string identifier = GetIdentifier();
+    static const rct_object_entry * scgWalls = object_list_find_by_name("SCGWALLS");
 
     // ToonTowner's base blocks. Make them allow supports on top and put them in the Walls and Roofs group.
     if (String::Equals(identifier, "XXBBCL01") ||
@@ -165,7 +166,6 @@ void SmallSceneryObject::PerformFixes()
         String::Equals(identifier, "XXBBBR01") ||
         String::Equals(identifier, "ARBASE2 "))
     {
-        static const rct_object_entry * scgWalls = object_list_find_by_name("SCGWALLS");
         if (scgWalls != nullptr)
         {
             SetPrimarySceneryGroup((rct_object_entry *)scgWalls);
@@ -174,6 +174,19 @@ void SmallSceneryObject::PerformFixes()
         _legacyType.small_scenery.flags |= SMALL_SCENERY_FLAG_BUILD_DIRECTLY_ONTOP;
     }
 
+    // ToonTowner's regular roofs. Put them in the Walls and Roofs group.
+    if (String::Equals(identifier, "TTRFTL02") ||
+        String::Equals(identifier, "TTRFTL03") ||
+        String::Equals(identifier, "TTRFTL04") ||
+        String::Equals(identifier, "TTRFTL07") ||
+        String::Equals(identifier, "TTRFTL08"))
+    {
+        if (scgWalls != nullptr)
+        {
+            SetPrimarySceneryGroup((rct_object_entry *)scgWalls);
+        }
+    }
+
     // ToonTowner's Pirate roofs. Make them show up in the Pirate Theming.
     if (String::Equals(identifier, "TTPIRF02") ||
         String::Equals(identifier, "TTPIRF03") ||
@@ -191,4 +204,21 @@ void SmallSceneryObject::PerformFixes()
             SetPrimarySceneryGroup((rct_object_entry *)scgPirat);
         }
     }
+
+    // ToonTowner's wooden roofs. Make them show up in the Mine Theming.
+    if (String::Equals(identifier, "TTRFWD01") ||
+        String::Equals(identifier, "TTRFWD02") ||
+        String::Equals(identifier, "TTRFWD03") ||
+        String::Equals(identifier, "TTRFWD04") ||
+        String::Equals(identifier, "TTRFWD05") ||
+        String::Equals(identifier, "TTRFWD06") ||
+        String::Equals(identifier, "TTRFWD07") ||
+        String::Equals(identifier, "TTRFWD08"))
+    {
+        static const rct_object_entry * scgMine = object_list_find_by_name("SCGMINE ");
+        if (scgMine != nullptr)
+        {
+            SetPrimarySceneryGroup((rct_object_entry *)scgMine);
+        }
+    }
 }