mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Rename EditorObjectFlagsClear, VisibleListClear

Browse Source
This commit is contained in:
Aaron van Geffen
2025-03-22 22:59:40 +01:00
parent d97ae02db2
commit bcbc71eb72
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,7 +306,7 @@ namespace OpenRCT2::Ui::Windows
{ {
UnloadUnselectedObjects(); UnloadUnselectedObjects();
EditorLoadSelectedObjects(); EditorLoadSelectedObjects();
EditorObjectFlagsFree(); EditorObjectFlagsClear();
if (_loadedObject != nullptr) if (_loadedObject != nullptr)
_loadedObject->Unload(); _loadedObject->Unload();
@@ -327,7 +327,7 @@ namespace OpenRCT2::Ui::Windows
auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES); auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES);
ContextBroadcastIntent(&intent); ContextBroadcastIntent(&intent);
VisibleListDispose(); VisibleListClear();
intent = Intent(INTENT_ACTION_REFRESH_SCENERY); intent = Intent(INTENT_ACTION_REFRESH_SCENERY);
ContextBroadcastIntent(&intent); ContextBroadcastIntent(&intent);
@@ -1173,7 +1173,7 @@ namespace OpenRCT2::Ui::Windows
{ {
int32_t numObjects = static_cast<int32_t>(ObjectRepositoryGetItemsCount()); int32_t numObjects = static_cast<int32_t>(ObjectRepositoryGetItemsCount());
VisibleListDispose(); VisibleListClear();
selected_list_item = -1; selected_list_item = -1;
const ObjectRepositoryItem* items = ObjectRepositoryGetItems(); const ObjectRepositoryItem* items = ObjectRepositoryGetItems();
@@ -1200,7 +1200,7 @@ namespace OpenRCT2::Ui::Windows
if (_listItems.empty()) if (_listItems.empty())
{ {
VisibleListDispose(); VisibleListClear();
} }
else else
{ {
@@ -1229,7 +1229,7 @@ namespace OpenRCT2::Ui::Windows
Invalidate(); Invalidate();
} }
void VisibleListDispose() void VisibleListClear()
{ {
_listItems.clear(); _listItems.clear();
_listItems.shrink_to_fit(); _listItems.shrink_to_fit();

4
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -355,7 +355,7 @@ void Sub6AB211()
* *
* rct2: 0x006AB316 * rct2: 0x006AB316
*/ */
void EditorObjectFlagsFree() void EditorObjectFlagsClear()
{ {
_objectSelectionFlags.clear(); _objectSelectionFlags.clear();
_objectSelectionFlags.shrink_to_fit(); _objectSelectionFlags.shrink_to_fit();
@@ -771,7 +771,7 @@ int32_t EditorRemoveUnusedObjects()
} }
} }
UnloadUnselectedObjects(); UnloadUnselectedObjects();
EditorObjectFlagsFree(); EditorObjectFlagsClear();
auto intent = Intent(INTENT_ACTION_REFRESH_SCENERY); auto intent = Intent(INTENT_ACTION_REFRESH_SCENERY);
ContextBroadcastIntent(&intent); ContextBroadcastIntent(&intent);

2
src/openrct2/EditorObjectSelectionSession.h
View File

@@ -33,7 +33,7 @@ extern uint32_t _numSelectedObjectsForType[EnumValue(ObjectType::count)];
bool EditorCheckObjectGroupAtLeastOneSelected(ObjectType checkObjectType); bool EditorCheckObjectGroupAtLeastOneSelected(ObjectType checkObjectType);
bool EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(uint8_t peepType); bool EditorCheckObjectGroupAtLeastOneOfPeepTypeSelected(uint8_t peepType);
bool EditorCheckObjectGroupAtLeastOneSurfaceSelected(bool queue); bool EditorCheckObjectGroupAtLeastOneSurfaceSelected(bool queue);
void EditorObjectFlagsFree(); void EditorObjectFlagsClear();
void UnloadUnselectedObjects(); void UnloadUnselectedObjects();
void Sub6AB211(); void Sub6AB211();
void ResetSelectedObjectCountAndSize(); void ResetSelectedObjectCountAndSize();