diff options
| author | terkhen <terkhen@openttd.org> | 2010-11-06 12:53:31 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2010-11-06 12:53:31 +0000 |
| commit | c8a56f17f82be7d4a8e935fc514c86a313dc7d15 (patch) | |
| tree | 4a2552f26ee887aa326721881fbbe6f62b8b48d2 /src/vehicle_gui.cpp | |
| parent | 78d0a1cb1af68863e3e7bfed584f4a94ee46f611 (diff) | |
| download | openttd-c8a56f17f82be7d4a8e935fc514c86a313dc7d15.tar.xz | |
(svn r21097) -Codechange: Unify cached max speed for all vehicle types.
Diffstat (limited to 'src/vehicle_gui.cpp')
| -rw-r--r-- | src/vehicle_gui.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 23b1e1e42..7c788b3eb 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -807,10 +807,8 @@ static int CDECL VehicleReliabilitySorter(const Vehicle * const *a, const Vehicl static int CDECL VehicleMaxSpeedSorter(const Vehicle * const *a, const Vehicle * const *b) { int r = 0; - if ((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) { - r = Train::From(*a)->tcache.cached_max_speed - Train::From(*b)->tcache.cached_max_speed; - } if ((*a)->type == VEH_AIRCRAFT && (*b)->type == VEH_AIRCRAFT) { - r = Aircraft::From(*a)->acache.cached_max_speed - Aircraft::From(*b)->acache.cached_max_speed; + if (((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) || ((*a)->type == VEH_AIRCRAFT && (*b)->type == VEH_AIRCRAFT)) { + r = (*a)->vcache.cached_max_speed - (*b)->vcache.cached_max_speed; } else { r = (*a)->max_speed - (*b)->max_speed; } |