From 5e6b5d981f26a6f4f83c07fdd545a4036506c125 Mon Sep 17 00:00:00 2001 From: Joan Josep Date: Sun, 27 Aug 2023 22:12:44 +0200 Subject: [PATCH] Codechange: Use existing functions in GetMonthlyInfrastructureCosts. (#11237) --- src/script/api/script_infrastructure.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/script/api/script_infrastructure.cpp b/src/script/api/script_infrastructure.cpp index bfe78a7b58..3d6bdd2fcc 100644 --- a/src/script/api/script_infrastructure.cpp +++ b/src/script/api/script_infrastructure.cpp @@ -41,24 +41,14 @@ ::Company *c = ::Company::Get((::CompanyID)company); switch (infra_type) { - case INFRASTRUCTURE_RAIL: { - uint32_t count = 0; - for (::RailType rt = ::RAILTYPE_BEGIN; rt != ::RAILTYPE_END; rt++) { - count += c->infrastructure.rail[rt]; - } - return count; - } + case INFRASTRUCTURE_RAIL: + return c->infrastructure.GetRailTotal(); case INFRASTRUCTURE_SIGNALS: return c->infrastructure.signal; - case INFRASTRUCTURE_ROAD: { - uint32_t count = 0; - for (::RoadType rt = ::ROADTYPE_BEGIN; rt != ::ROADTYPE_END; rt++) { - count += c->infrastructure.road[rt]; - } - return count; - } + case INFRASTRUCTURE_ROAD: + return c->infrastructure.GetRoadTotal() + c->infrastructure.GetTramTotal(); case INFRASTRUCTURE_CANAL: return c->infrastructure.water;