From 713a05f203316a434ccc562ddebc0f11476197c0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 23 Nov 2022 18:03:02 +0100 Subject: [PATCH] Remove obsolete object hacks --- src/openrct2/object/SmallSceneryObject.cpp | 33 ---------------------- src/openrct2/object/SmallSceneryObject.h | 2 -- 2 files changed, 35 deletions(-) diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index c1c9e55237..586e40329b 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -175,29 +175,6 @@ void SmallSceneryObject::PerformFixes() static const auto& scgPirat = GetScgPiratHeader(); SetPrimarySceneryGroup(scgPirat); } - - // ToonTowner's wooden roofs. Make them show up in the Mine Theming. - if (identifier == "TTRFWD01" || - identifier == "TTRFWD02" || - identifier == "TTRFWD03" || - identifier == "TTRFWD04" || - identifier == "TTRFWD05" || - identifier == "TTRFWD06" || - identifier == "TTRFWD07" || - identifier == "TTRFWD08") - { - static const auto& scgMine = GetScgMineHeader(); - SetPrimarySceneryGroup(scgMine); - } - - // ToonTowner's glass roofs. Make them show up in the Abstract Theming. - if (identifier == "TTRFGL01" || - identifier == "TTRFGL02" || - identifier == "TTRFGL03") - { - static const auto& scgAbstr = GetScgAbstrHeader(); - SetPrimarySceneryGroup(scgAbstr); - } } // clang-format on @@ -206,16 +183,6 @@ ObjectEntryDescriptor SmallSceneryObject::GetScgPiratHeader() const return ObjectEntryDescriptor("rct2.scenery_group.scgpirat"); } -ObjectEntryDescriptor SmallSceneryObject::GetScgMineHeader() const -{ - return ObjectEntryDescriptor("rct2.scgmine"); -} - -ObjectEntryDescriptor SmallSceneryObject::GetScgAbstrHeader() const -{ - return ObjectEntryDescriptor("rct2.scenery_group.scgabstr"); -} - void SmallSceneryObject::ReadJson(IReadObjectContext* context, json_t& root) { Guard::Assert(root.is_object(), "SmallSceneryObject::ReadJson expects parameter root to be object"); diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h index fcaadba643..884c3d0d2f 100644 --- a/src/openrct2/object/SmallSceneryObject.h +++ b/src/openrct2/object/SmallSceneryObject.h @@ -38,6 +38,4 @@ private: static std::vector ReadJsonFrameOffsets(json_t& jFrameOffsets); void PerformFixes(); ObjectEntryDescriptor GetScgPiratHeader() const; - ObjectEntryDescriptor GetScgMineHeader() const; - ObjectEntryDescriptor GetScgAbstrHeader() const; };