mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

pull/12488/head
Peter Nelson 2023-07-15 20:44:07 +01:00 committed by Loïc Guilloux
parent 40efa94d82
commit 481736fdfd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf_house.cpp
View File

@ -80,7 +80,7 @@ void ResetHouseClassIDs()
HouseClassID AllocateHouseClassID(byte grf_class_id, uint32_t grfid)
{
/* Start from 1 because 0 means that no class has been assigned. */
for (int i = 1; i != lengthof(_class_mapping); i++) {
for (uint i = 1; i != std::size(_class_mapping); i++) {
HouseClassMapping *map = &_class_mapping[i];
if (map->class_id == grf_class_id && map->grfid == grfid) return (HouseClassID)i;

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)) {
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); j++) {
for (uint j = 0; j < std::size(i->produced); 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];
}
}