dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/story.cpp
View File

@@ -157,8 +157,7 @@ CommandCost CmdCreateStoryPageElement(TileIndex tile, DoCommandFlag flags, uint3
/* Allow at most 128 elements per page. */
uint16 element_count = 0;
StoryPageElement *iter;
FOR_ALL_STORY_PAGE_ELEMENTS(iter) {
for (StoryPageElement *iter : StoryPageElement::Iterate()) {
if (iter->page == page_id) element_count++;
}
if (element_count >= 128) return CMD_ERROR;
@@ -317,8 +316,7 @@ CommandCost CmdRemoveStoryPage(TileIndex tile, DoCommandFlag flags, uint32 p1, u
if (flags & DC_EXEC) {
StoryPage *p = StoryPage::Get(page_id);
StoryPageElement *pe;
FOR_ALL_STORY_PAGE_ELEMENTS(pe) {
for (StoryPageElement *pe : StoryPageElement::Iterate()) {
if (pe->page == p->index) {
delete pe;
}