diff --git a/src/script/api/script_cargolist.cpp b/src/script/api/script_cargolist.cpp --- a/src/script/api/script_cargolist.cpp +++ b/src/script/api/script_cargolist.cpp @@ -29,10 +29,9 @@ ScriptCargoList_IndustryAccepting::Scrip if (!ScriptIndustry::IsValidIndustry(industry_id)) return; Industry *ind = ::Industry::Get(industry_id); - for (uint i = 0; i < lengthof(ind->accepts_cargo); i++) { - CargoID cargo_id = ind->accepts_cargo[i]; - if (::IsValidCargoID(cargo_id)) { - this->AddItem(cargo_id); + for (const auto &a : ind->accepted) { + if (::IsValidCargoID(a.cargo)) { + this->AddItem(a.cargo); } } } @@ -42,10 +41,9 @@ ScriptCargoList_IndustryProducing::Scrip if (!ScriptIndustry::IsValidIndustry(industry_id)) return; Industry *ind = ::Industry::Get(industry_id); - for (uint i = 0; i < lengthof(ind->produced_cargo); i++) { - CargoID cargo_id = ind->produced_cargo[i]; - if (::IsValidCargoID(cargo_id)) { - this->AddItem(cargo_id); + for (const auto &p : ind->produced) { + if (::IsValidCargoID(p.cargo)) { + this->AddItem(p.cargo); } } }