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

Simplify selected object flags

Browse Source
This commit is contained in:
Ted John
2018-02-11 17:56:12 +00:00
parent 76a997aa18
commit d905dde070
7 changed files with 93 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,8 +385,7 @@ rct_window * window_editor_object_selection_open()
if (window != nullptr)
return window;
if (!sub_6AB211())
return nullptr;
sub_6AB211();
reset_selected_object_count_and_size();
window = window_create_centred(
@@ -1419,7 +1418,7 @@ static bool filter_chunks(const ObjectRepositoryItem * item)
static void filter_update_counts()
{
if (!_FILTER_ALL || strlen(_filter_string) > 0) {
uint8 *selectionFlags = _objectSelectionFlags;
const auto &selectionFlags = _objectSelectionFlags;
for (sint32 i = 0; i < 11; i++) {
_filter_object_counts[i] = 0;
}
@@ -1431,12 +1430,11 @@ static void filter_update_counts()
if (filter_source(item) &&
filter_string(item) &&
filter_chunks(item) &&
filter_selected(*selectionFlags)
filter_selected(selectionFlags[i])
) {
uint8 objectType = item->ObjectEntry.flags & 0xF;
_filter_object_counts[objectType]++;
}
selectionFlags++;
}
}
}