From c5b854a42220e81a28fb460b9b95f4741f51d701 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sat, 15 Jul 2023 20:44:07 +0100 Subject: [PATCH] Codechange: Avoid lengthof() on std::array. (cherry picked from commit 295508fc533a8ce6b8ad9d7ae323ee204011af8e) --- src/saveload/afterload.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 2a25f4e4ad..60edcade81 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -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]; } }