From db56499c01126ae212a2734443fe95ef90a9fdd4 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 16 Apr 2024 15:47:41 +0100 Subject: [PATCH] Codechange: Use std::array for company infrastructure arrays. --- src/company_base.h | 4 ++-- src/company_gui.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/company_base.h b/src/company_base.h index 356a5fe058..98b5bb8612 100644 --- a/src/company_base.h +++ b/src/company_base.h @@ -30,9 +30,9 @@ struct CompanyEconomyEntry { }; struct CompanyInfrastructure { - uint32_t road[ROADTYPE_END]; ///< Count of company owned track bits for each road type. + std::array rail{}; ///< Count of company owned track bits for each rail type. + std::array road{}; ///< Count of company owned track bits for each road type. uint32_t signal; ///< Count of company owned signals. - uint32_t rail[RAILTYPE_END]; ///< Count of company owned track bits for each rail type. uint32_t water; ///< Count of company owned track bits for canals. uint32_t station; ///< Count of company owned station tiles. uint32_t airport; ///< Count of company owned airports. diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 2e387b4996..128826613b 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2338,7 +2338,7 @@ struct CompanyWindow : Window int y = r.top; uint rail_pieces = c->infrastructure.signal; - for (uint i = 0; i < lengthof(c->infrastructure.rail); i++) rail_pieces += c->infrastructure.rail[i]; + for (uint i = 0; i < std::size(c->infrastructure.rail); i++) rail_pieces += c->infrastructure.rail[i]; if (rail_pieces != 0) { SetDParam(0, rail_pieces); DrawString(r.left, r.right, y, STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL); @@ -2346,7 +2346,7 @@ struct CompanyWindow : Window } uint road_pieces = 0; - for (uint i = 0; i < lengthof(c->infrastructure.road); i++) road_pieces += c->infrastructure.road[i]; + for (uint i = 0; i < std::size(c->infrastructure.road); i++) road_pieces += c->infrastructure.road[i]; if (road_pieces != 0) { SetDParam(0, road_pieces); DrawString(r.left, r.right, y, STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD);