Codechange: Replace story related FOR_ALL with range-based for loops

This commit is contained in:
glx
2019-12-17 21:21:33 +01:00
committed by Niels Martin Hansen
parent 869581eb23
commit 847e5f33d4
7 changed files with 10 additions and 26 deletions

View File

@@ -17,8 +17,7 @@ ScriptStoryPageElementList::ScriptStoryPageElementList(ScriptStoryPage::StoryPag
{
if (!ScriptStoryPage::IsValidStoryPage(story_page_id)) return;
StoryPageElement *pe;
FOR_ALL_STORY_PAGE_ELEMENTS(pe) {
for (StoryPageElement *pe : StoryPageElement::Iterate()) {
if (pe->page == story_page_id) {
this->AddItem(pe->index);
}

View File

@@ -19,8 +19,7 @@ ScriptStoryPageList::ScriptStoryPageList(ScriptCompany::CompanyID company)
uint8 c = company;
if (company == ScriptCompany::COMPANY_INVALID) c = INVALID_COMPANY;
StoryPage *p;
FOR_ALL_STORY_PAGES(p) {
for (StoryPage *p : StoryPage::Iterate()) {
if (p->company == c || p->company == INVALID_COMPANY) {
this->AddItem(p->index);
}