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

Codechange: Avoid lengthof() on std::array.

Browse Source 
(cherry picked from commit 295508fc53)
This commit is contained in:
Peter Nelson
2023-07-15 20:44:07 +01:00
committed by Jonathan G Rennison
parent 9b830e9eb2
commit c5b854a422
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/saveload/afterload.cpp
View File

@@ -2116,14 +2116,15 @@ bool AfterLoadGame()
}
}
/* At version 78, industry cargo types can be changed, and are stored with the industry. For older save versions
* copy the IndustrySpec's cargo types over to the Industry. */
if (IsSavegameVersionBefore(SLV_78)) {
uint j;
for (Industry * i : Industry::Iterate()) {
for (Industry *i : Industry::Iterate()) {
const IndustrySpec *indsp = GetIndustrySpec(i->type);
for (j = 0; j < lengthof(i->produced_cargo); j++) {
for (size_t j = 0; j < std::size(i->produced_cargo); j++) {
i->produced_cargo[j] = indsp->produced_cargo[j];
}
for (j = 0; j < lengthof(i->accepts_cargo); j++) {
for (size_t j = 0; j < std::size(i->accepts_cargo); j++) {
i->accepts_cargo[j] = indsp->accepts_cargo[j];
}
}