From 74228ed35fe674d4255e22b539d469286ed27016 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 10 Mar 2018 13:58:49 +0000 Subject: [PATCH] Use iterators again for removing empty headings Improving on f00aa15096dd1d65388fe4ce841798c256df85b1, continue to use iterator and just set it to the result of erase. --- src/openrct2-ui/windows/TitleScenarioSelect.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index f5aa6da9bf..75f972cfd8 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -681,16 +681,16 @@ static void initialise_list_items(rct_window *w) _listItems.pop_back(); // Remove empty headings - for (size_t i = 0; i < _listItems.size(); i++) + for (auto it = _listItems.begin(); it != _listItems.end(); it++) { - const auto &listItem = _listItems[i]; + const auto &listItem = *it; if (listItem.type == LIST_ITEM_TYPE::HEADING) { - if (i + 1 == _listItems.size() || - _listItems[i + 1].type == LIST_ITEM_TYPE::HEADING) + if ((it + 1) == _listItems.end() || + (it + 1)->type == LIST_ITEM_TYPE::HEADING) { - _listItems.erase(_listItems.begin() + i); - i--; + it = _listItems.erase(it); + it--; } } }