mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8484: Object selection doesn't work 

Revert change to _filter_object_counts from d145ae6922
This commit is contained in:
Ted John 2018-12-22 11:18:17 +00:00
parent 65dcdf77ea
commit fa3374c827
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ enum
static constexpr uint8_t _numSourceGameItems = 8;
static uint32_t _filter_flags;
static uint16_t _filter_object_counts[OBJECT_TYPE_COUNT];
static char _filter_string[MAX_PATH];
@ -107,8 +108,6 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
// { STR_OBJECT_SELECTION_MUSIC, SPR_TAB_MUSIC_0, false },
};
static uint16_t _filter_object_counts[std::size(ObjectSelectionPages)];
#pragma region Widgets
enum WINDOW_STAFF_LIST_WIDGET_IDX {
@ -1473,10 +1472,7 @@ static void filter_update_counts()
if (!_FILTER_ALL || strlen(_filter_string) > 0)
{
const auto& selectionFlags = _objectSelectionFlags;
for (size_t i = 0; i < std::size(ObjectSelectionPages); i++)
{
_filter_object_counts[i] = 0;
}
std::fill(std::begin(_filter_object_counts), std::end(_filter_object_counts), 0);
size_t numObjects = object_repository_get_items_count();
const ObjectRepositoryItem* items = object_repository_get_items();