mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #19481 from Gymnasiast/feature/compat-object

Browse Source 
Add flag to mark an object as a compatibility object
This commit is contained in:
Matthias Moninger
2023-04-03 11:17:13 +03:00
committed by GitHub
parent de06f6026e af167552fb
commit d7923c479e
9 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1132,7 +1132,8 @@ private:
uint8_t selectionFlags = _objectSelectionFlags[i];
const ObjectRepositoryItem* item = &items[i];
if (item->Type == GetSelectedObjectType() && !(selectionFlags & ObjectSelectionFlags::Flag6) && FilterSource(item)
&& FilterString(*item) && FilterChunks(item) && FilterSelected(selectionFlags))
&& FilterString(*item) && FilterChunks(item) && FilterSelected(selectionFlags)
&& FilterCompatibilityObject(*item, selectionFlags))
{
auto filter = std::make_unique<RideFilters>();
filter->category[0] = 0;
@@ -1190,6 +1191,14 @@ private:
auto screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_LIST].right + 4, widget.bottom + 23 };
auto _width2 = windowPos.x + this->width - screenPos.x - 4;
if (_loadedObject->IsCompatibilityObject())
{
screenPos.y += DrawTextWrapped(
*dpi, screenPos, _width2, STR_OBJECT_SELECTION_COMPAT_OBJECT_DESCRIPTION, {},
{ COLOUR_BRIGHT_RED })
+ LIST_ROW_HEIGHT;
}
auto description = ObjectGetDescription(_loadedObject.get());
if (!description.empty())
{
@@ -1329,6 +1338,12 @@ private:
return false;
}
bool FilterCompatibilityObject(const ObjectRepositoryItem& item, uint8_t objectFlag)
{
// Only show compat objects if they are not selected already.
return !(item.Flags & ObjectItemFlags::IsCompatibilityObject) || (objectFlag & ObjectSelectionFlags::Selected);
}
static bool IsFilterInName(const ObjectRepositoryItem& item, std::string_view filter)
{
return String::Contains(item.Name, filter, true);
@@ -1438,7 +1453,8 @@ private:
for (size_t i = 0; i < numObjects; i++)
{
const ObjectRepositoryItem* item = &items[i];
if (FilterSource(item) && FilterString(*item) && FilterChunks(item) && FilterSelected(selectionFlags[i]))
if (FilterSource(item) && FilterString(*item) && FilterChunks(item) && FilterSelected(selectionFlags[i])
&& FilterCompatibilityObject(*item, selectionFlags[i]))
{
_filter_object_counts[EnumValue(item->Type)]++;
}