gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13617) -Codechange: calculate the diff in StationWaitingSorter directly

Browse Source
This commit is contained in:
skidd13 2008-06-23 22:51:21 +00:00
parent 469ecf4bd2
commit 6e1dd7f719
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/station_gui.cpp
View File

@ -168,16 +168,15 @@ protected:
/** Sort stations by their waiting cargo */ /** Sort stations by their waiting cargo */
static int CDECL StationWaitingSorter(const Station* const *a, const Station* const *b) static int CDECL StationWaitingSorter(const Station* const *a, const Station* const *b)
{ {
Money sum1 = 0; Money diff = 0;
Money sum2 = 0;
for (CargoID j = 0; j < NUM_CARGO; j++) { for (CargoID j = 0; j < NUM_CARGO; j++) {
if (!HasBit(cargo_filter, j)) continue; if (!HasBit(cargo_filter, j)) continue;
if (!(*a)->goods[j].cargo.Empty()) sum1 += GetTransportedGoodsIncome((*a)->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()) sum2 += GetTransportedGoodsIncome((*b)->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 */ /** Sort stations by their rating */