mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Peter Nelson 2023-07-15 20:44:07 +01:00 committed by Peter Nelson
parent f79ec7955a
commit 295508fc53
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/saveload/afterload.cpp
View File

@ -1708,14 +1708,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)) { if (IsSavegameVersionBefore(SLV_78)) {
uint j; for (Industry *i : Industry::Iterate()) {
for (Industry * i : Industry::Iterate()) {
const IndustrySpec *indsp = GetIndustrySpec(i->type); const IndustrySpec *indsp = GetIndustrySpec(i->type);
for (j = 0; j < lengthof(i->produced); j++) { for (uint j = 0; j < std::size(i->produced); j++) {
i->produced[j].cargo = indsp->produced_cargo[j]; i->produced[j].cargo = indsp->produced_cargo[j];
} }
for (j = 0; j < lengthof(i->accepted); j++) { for (uint j = 0; j < std::size(i->accepted); j++) {
i->accepted[j].cargo = indsp->accepts_cargo[j]; i->accepted[j].cargo = indsp->accepts_cargo[j];
} }
} }