diff options
| author | rubidium <rubidium@openttd.org> | 2007-06-21 14:32:27 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-06-21 14:32:27 +0000 |
| commit | f806b46cc967202db3d2fbf3384d0f037c13ed8a (patch) | |
| tree | 4d9bfa9de886f7ff167c4fa02326f5cd302e8cce /src/station_gui.cpp | |
| parent | 06fded123a346d556ceb2f4585429046ddf8f1b9 (diff) | |
| download | openttd-f806b46cc967202db3d2fbf3384d0f037c13ed8a.tar.xz | |
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
Diffstat (limited to 'src/station_gui.cpp')
| -rw-r--r-- | src/station_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 045f927b9..dd8e8a99c 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -131,14 +131,14 @@ static int CDECL StationWaitingSorter(const void *a, const void *b) { const Station* st1 = *(const Station**)a; const Station* st2 = *(const Station**)b; - int sum1 = 0, sum2 = 0; + Money sum1 = 0, sum2 = 0; for (CargoID j = 0; j < NUM_CARGO; j++) { if (st1->goods[j].waiting_acceptance & 0xfff) sum1 += GetTransportedGoodsIncome(st1->goods[j].waiting_acceptance & 0xfff, 20, 50, j); if (st2->goods[j].waiting_acceptance & 0xfff) sum2 += GetTransportedGoodsIncome(st2->goods[j].waiting_acceptance & 0xfff, 20, 50, j); } - return (_internal_sort_order & 1) ? sum2 - sum1 : sum1 - sum2; + return (_internal_sort_order & 1) ? ClampToI32(sum2 - sum1) : ClampToI32(sum1 - sum2); } /** |