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/vehicle_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/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index fca73e38b..b9bd7bb31 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -589,7 +589,7 @@ static int CDECL VehicleProfitThisYearSorter(const void *a, const void *b) { const Vehicle* va = *(const Vehicle**)a; const Vehicle* vb = *(const Vehicle**)b; - int r = va->profit_this_year - vb->profit_this_year; + int r = ClampToI32(va->profit_this_year - vb->profit_this_year); VEHICLEUNITNUMBERSORTER(r, va, vb); @@ -600,7 +600,7 @@ static int CDECL VehicleProfitLastYearSorter(const void *a, const void *b) { const Vehicle* va = *(const Vehicle**)a; const Vehicle* vb = *(const Vehicle**)b; - int r = va->profit_last_year - vb->profit_last_year; + int r = ClampToI32(va->profit_last_year - vb->profit_last_year); VEHICLEUNITNUMBERSORTER(r, va, vb); @@ -687,13 +687,12 @@ static int CDECL VehicleValueSorter(const void *a, const void *b) const Vehicle* va = *(const Vehicle**)a; const Vehicle* vb = *(const Vehicle**)b; const Vehicle *u; - int valuea = 0, valueb = 0; - int r; + Money valuea = 0, valueb = 0; for (u = va; u != NULL; u = u->next) valuea += u->value; for (u = vb; u != NULL; u = u->next) valueb += u->value; - r = valuea - valueb; + int r = ClampToI32(valuea - valueb); VEHICLEUNITNUMBERSORTER(r, va, vb); |