From 241435226c19ef7a4359a7205bf9ebcb72a9138a Mon Sep 17 00:00:00 2001 From: skidd13 Date: Mon, 23 Jun 2008 22:51:21 +0000 Subject: (svn r13617) -Codechange: calculate the diff in StationWaitingSorter directly --- src/station_gui.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 50fa33445..881ec021c 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -168,16 +168,15 @@ protected: /** Sort stations by their waiting cargo */ static int CDECL StationWaitingSorter(const Station* const *a, const Station* const *b) { - Money sum1 = 0; - Money sum2 = 0; + Money diff = 0; for (CargoID j = 0; j < NUM_CARGO; j++) { if (!HasBit(cargo_filter, j)) continue; - if (!(*a)->goods[j].cargo.Empty()) sum1 += GetTransportedGoodsIncome((*a)->goods[j].cargo.Count(), 20, 50, j); - if (!(*b)->goods[j].cargo.Empty()) sum2 += GetTransportedGoodsIncome((*b)->goods[j].cargo.Count(), 20, 50, j); + if (!(*a)->goods[j].cargo.Empty()) diff += GetTransportedGoodsIncome((*a)->goods[j].cargo.Count(), 20, 50, j); + if (!(*b)->goods[j].cargo.Empty()) diff -= GetTransportedGoodsIncome((*b)->goods[j].cargo.Count(), 20, 50, j); } - return ClampToI32(sum1 - sum2); + return ClampToI32(diff); } /** Sort stations by their rating */ -- cgit v1.2.3-54-g00ecf