mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove obsolete object hacks

Browse source
This commit is contained in:
Gymnasiast 2022-11-23 18:03:02 +01:00
parent 2ce2fd307e
commit 713a05f203
No known key found for this signature in database
GPG key ID: DBFFF47AB2CA3EDD
2 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/openrct2/object/SmallSceneryObject.cpp
View file

@ -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");

2
src/openrct2/object/SmallSceneryObject.h
View file

@ -38,6 +38,4 @@ private:
static std::vector<uint8_t> ReadJsonFrameOffsets(json_t& jFrameOffsets);
void PerformFixes();
ObjectEntryDescriptor GetScgPiratHeader() const;
ObjectEntryDescriptor GetScgMineHeader() const;
ObjectEntryDescriptor GetScgAbstrHeader() const;
};