From bcbc71eb7232f4dd8c093e497577deb9034e6b0e Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 22 Mar 2025 22:59:40 +0100 Subject: [PATCH] Rename EditorObjectFlagsClear, VisibleListClear --- src/openrct2-ui/windows/EditorObjectSelection.cpp | 10 +++++----- src/openrct2/EditorObjectSelectionSession.cpp | 4 ++-- src/openrct2/EditorObjectSelectionSession.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 5dcf70b21d..022d645b24 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -306,7 +306,7 @@ namespace OpenRCT2::Ui::Windows { UnloadUnselectedObjects(); EditorLoadSelectedObjects(); - EditorObjectFlagsFree(); + EditorObjectFlagsClear(); if (_loadedObject != nullptr) _loadedObject->Unload(); @@ -327,7 +327,7 @@ namespace OpenRCT2::Ui::Windows auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES); ContextBroadcastIntent(&intent); - VisibleListDispose(); + VisibleListClear(); intent = Intent(INTENT_ACTION_REFRESH_SCENERY); ContextBroadcastIntent(&intent); @@ -1173,7 +1173,7 @@ namespace OpenRCT2::Ui::Windows { int32_t numObjects = static_cast(ObjectRepositoryGetItemsCount()); - VisibleListDispose(); + VisibleListClear(); selected_list_item = -1; const ObjectRepositoryItem* items = ObjectRepositoryGetItems(); @@ -1200,7 +1200,7 @@ namespace OpenRCT2::Ui::Windows if (_listItems.empty()) { - VisibleListDispose(); + VisibleListClear(); } else { @@ -1229,7 +1229,7 @@ namespace OpenRCT2::Ui::Windows Invalidate(); } - void VisibleListDispose() + void VisibleListClear() { _listItems.clear(); _listItems.shrink_to_fit(); diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 90c182f1c6..a6063e2a1b 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -355,7 +355,7 @@ void Sub6AB211() * * rct2: 0x006AB316 */ -void EditorObjectFlagsFree() +void EditorObjectFlagsClear() { _objectSelectionFlags.clear(); _objectSelectionFlags.shrink_to_fit(); @@ -771,7 +771,7 @@ int32_t EditorRemoveUnusedObjects() } } UnloadUnselectedObjects(); - EditorObjectFlagsFree(); + EditorObjectFlagsClear(); auto intent = Intent(INTENT_ACTION_REFRESH_SCENERY); ContextBroadcastIntent(&intent); diff --git a/src/openrct2/EditorObjectSelectionSession.h b/src/openrct2/EditorObjectSelectionSession.h index 6dfc3f7507..331fb100be 100644 --- a/src/openrct2/EditorObjectSelectionSession.h +++ b/src/openrct2/EditorObjectSelectionSession.h @@ -33,7 +33,7 @@ extern uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::count)]; bool EditorCheckObjectGroupAtLeastOneSelected(ObjectType checkObjectType); bool EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(uint8_t peepType); bool EditorCheckObjectGroupAtLeastOneSurfaceSelected(bool queue); -void EditorObjectFlagsFree(); +void EditorObjectFlagsClear(); void UnloadUnselectedObjects(); void Sub6AB211(); void ResetSelectedObjectCountAndSize();