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

Codechange: Refactor FindStationsAroundTiles to avoid code duplication

Browse Source
This commit is contained in:
dP
2020-05-12 01:36:28 +03:00
committed by Charles Pigott
parent 2d5869fc79
commit 7bd52970a1
7 changed files with 61 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/industry_cmd.cpp
View File

@@ -1697,20 +1697,10 @@ static void PopulateStationsNearby(Industry *ind)
return;
}
/* Get our list of nearby stations. */
FindStationsAroundTiles(ind->location, &ind->stations_near, false);
/* Test if industry can accept cargo */
uint cargo_index;
for (cargo_index = 0; cargo_index < lengthof(ind->accepts_cargo); cargo_index++) {
if (ind->accepts_cargo[cargo_index] != CT_INVALID) break;
}
if (cargo_index >= lengthof(ind->accepts_cargo)) return;
/* Cargo is accepted, add industry to nearby stations nearby industry list. */
for (Station *st : ind->stations_near) {
st->industries_near.insert(ind);
}
ForAllStationsAroundTiles(ind->location, [ind](Station *st) {
ind->stations_near.insert(st);
st->AddIndustryToDeliver(ind);
});
}
/**