mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Remove bad identifier users

Browse Source 
Note this doesn't actually do anything under the hood it will do the same thing for now
This commit is contained in:
duncanspumpkin
2023-05-22 08:46:15 +01:00
parent b9382ae9fc
commit 8f53c6dbd3
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/object/BannerObject.cpp
View File

@@ -41,10 +41,9 @@ void BannerObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* st
// Add banners to 'Signs and items for footpaths' group, rather than lumping them in the Miscellaneous tab.
// Since this is already done the other way round for original items, avoid adding those to prevent duplicates.
auto identifier = GetLegacyIdentifier();
auto& objectRepository = context->GetObjectRepository();
auto item = objectRepository.FindObjectLegacy(identifier);
auto item = objectRepository.FindObject(GetDescriptor());
if (item != nullptr)
{
auto sourceGame = item->GetFirstSourceGame();

2
src/openrct2/object/Object.h
View File

@@ -265,7 +265,7 @@ public:
return _usesFallbackImages;
}
// Legacy data structures
// DONOT USE THIS CAN LEAD TO OBJECT COLLISIONS
std::string_view GetLegacyIdentifier() const
{
return _descriptor.GetName();

3
src/openrct2/object/PathAdditionObject.cpp
View File

@@ -45,10 +45,9 @@ void PathAdditionObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
// Add path additions to 'Signs and items for footpaths' group, rather than lumping them in the Miscellaneous tab.
// Since this is already done the other way round for original items, avoid adding those to prevent duplicates.
auto identifier = GetLegacyIdentifier();
auto& objectRepository = context->GetObjectRepository();
auto item = objectRepository.FindObjectLegacy(identifier);
auto item = objectRepository.FindObject(GetDescriptor());
if (item != nullptr)
{
auto sourceGame = item->GetFirstSourceGame();