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

Add new source field to ORI struct

Browse Source
This commit is contained in:
Ted John
2018-06-30 10:55:59 +01:00
committed by Gymnasiast
parent 5ce76e1603
commit ec0d35bac7
5 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -1435,34 +1435,7 @@ static bool filter_source(const ObjectRepositoryItem* item, bool selected)
if (_FILTER_ALL)
return true;
uint8_t source = object_entry_get_source_game(&item->ObjectEntry);
uint8_t secondSource = OBJECT_SOURCE_CUSTOM;
_loadedObject = item->LoadedObject;
if (_loadedObject == nullptr)
{
_loadedObject = object_manager_get_loaded_object(&item->ObjectEntry);
}
if (_loadedObject == nullptr)
{
_loadedObject = object_manager_load_object(&item->ObjectEntry);
}
if (_loadedObject != nullptr)
{
secondSource = ((Object*)_loadedObject)->GetSecondSourceGame();
}
if (!selected && _loadedObject != nullptr)
{
uint8_t objectType = object_entry_get_type(&item->ObjectEntry);
if (objectType != OBJECT_TYPE_PARK_ENTRANCE && objectType != OBJECT_TYPE_SCENARIO_TEXT && objectType != OBJECT_TYPE_WATER && objectType != OBJECT_TYPE_SCENERY_GROUP)
{
((Object*)_loadedObject)->Unload();
}
}
return sources_match(source) || (secondSource != OBJECT_SOURCE_CUSTOM && sources_match(secondSource));
return sources_match(item->Source);
}
static bool filter_chunks(const ObjectRepositoryItem* item)