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

Fix #11208: Cannot export parks with RCT2 DLC objects (#11212)

Browse Source 
* Do not try to export official objects

* Do not override legacy object's source games

* Amend changelog
This commit is contained in:
Michael Steenbeek
2020-04-04 08:06:34 +02:00
committed by GitHub
parent 89ae2b51d6
commit 13a2f67400
4 changed files with 11 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -656,8 +656,16 @@ bool IsObjectCustom(const ObjectRepositoryItem* object)
return false;
}
// Validate the object is not one from base game or expansion pack
return !(object->ObjectEntry.flags & 0xF0);
switch (object->GetFirstSourceGame())
{
case OBJECT_SOURCE_RCT2:
case OBJECT_SOURCE_WACKY_WORLDS:
case OBJECT_SOURCE_TIME_TWISTER:
case OBJECT_SOURCE_OPENRCT2_OFFICIAL:
return false;
default:
return true;
}
}
const rct_object_entry* object_list_find(rct_object_entry* entry)