From 56510b5d7b9d7d9c96892bfd7241008104731220 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Wed, 11 Dec 2024 19:24:58 +0000 Subject: [PATCH] Codechange: Use CargoArray for linkgraph refresher. (#13165) `uint capacities[NUM_CARGO]` looks a lot like CargoArray. --- src/linkgraph/refresh.cpp | 2 -- src/linkgraph/refresh.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/linkgraph/refresh.cpp b/src/linkgraph/refresh.cpp index 205f51ac117..fc62ace093c 100644 --- a/src/linkgraph/refresh.cpp +++ b/src/linkgraph/refresh.cpp @@ -70,8 +70,6 @@ LinkRefresher::LinkRefresher(Vehicle *vehicle, HopSet *seen_hops, bool allow_mer vehicle(vehicle), seen_hops(seen_hops), cargo(INVALID_CARGO), allow_merge(allow_merge), is_full_loading(is_full_loading) { - memset(this->capacities, 0, sizeof(this->capacities)); - /* Assemble list of capacities and set last loading stations to 0. */ for (Vehicle *v = this->vehicle; v != nullptr; v = v->Next()) { this->refit_capacities.push_back(RefitDesc(v->cargo_type, v->cargo_cap, v->refit_cap)); diff --git a/src/linkgraph/refresh.h b/src/linkgraph/refresh.h index 1d2b26ae651..f69805bf001 100644 --- a/src/linkgraph/refresh.h +++ b/src/linkgraph/refresh.h @@ -78,7 +78,7 @@ class LinkRefresher { typedef std::set HopSet; Vehicle *vehicle; ///< Vehicle for which the links should be refreshed. - uint capacities[NUM_CARGO]; ///< Current added capacities per cargo ID in the consist. + CargoArray capacities; ///< Current added capacities per cargo ID in the consist. RefitList refit_capacities; ///< Current state of capacity remaining from previous refits versus overall capacity per vehicle in the consist. HopSet *seen_hops; ///< Hops already seen. If the same hop is seen twice we stop the algorithm. This is shared between all Refreshers of the same run. CargoID cargo; ///< Cargo given in last refit order.