mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Work on RCT1 path import

Browse Source
This commit is contained in:
Ted John
2021-04-12 19:41:34 +01:00
parent 0a8f810e5d
commit ef6d8a6e69
13 changed files with 693 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/object/ObjectRepository.cpp
View File

@@ -414,7 +414,15 @@ private:
bool AddItem(const ObjectRepositoryItem& item)
{
auto conflict = FindObject(&item.ObjectEntry);
const ObjectRepositoryItem* conflict{};
if (item.ObjectEntry.name[0] != '\0')
{
conflict = FindObject(&item.ObjectEntry);
}
if (conflict == nullptr)
{
conflict = FindObject(item.Identifier);
}
if (conflict == nullptr)
{
size_t index = _items.size();