diff options
author | skidd13 <skidd13@openttd.org> | 2008-06-23 22:51:21 +0000 |
---|---|---|
committer | skidd13 <skidd13@openttd.org> | 2008-06-23 22:51:21 +0000 |
commit | 6e1dd7f719e86171f789c4f9fa0102db6f12bfca (patch) | |
tree | 1f2f8c67b6b48bdb241f6729ae531da4ed843951 | |
parent | 469ecf4bd2f35f5a02b31e381f1fade90cceba64 (diff) | |
download | openttd-6e1dd7f719e86171f789c4f9fa0102db6f12bfca.tar.xz |
(svn r13617) -Codechange: calculate the diff in StationWaitingSorter directly
-rw-r--r-- | src/station_gui.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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 */ |