Mercurial > hg > openttd
changeset 8555:d0150d374a7b draft
(svn r12133) -Fix: Vehicle sorting by max speed did not work properly for trains. Instead of trying to work it out again, just use the cached values...
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Wed, 13 Feb 2008 18:11:19 +0000 |
parents | 9bf902b801c6 |
children | 8aae08d562cc |
files | src/vehicle_gui.cpp |
diffstat | 1 files changed, 1 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -644,22 +644,10 @@ { const Vehicle* va = *(const Vehicle**)a; const Vehicle* vb = *(const Vehicle**)b; - int max_speed_a = 0xFFFF, max_speed_b = 0xFFFF; int r; - const Vehicle *ua = va, *ub = vb; if (va->type == VEH_TRAIN && vb->type == VEH_TRAIN) { - do { - if (RailVehInfo(ua->engine_type)->max_speed != 0) - max_speed_a = min(max_speed_a, RailVehInfo(ua->engine_type)->max_speed); - } while ((ua = ua->Next()) != NULL); - - do { - if (RailVehInfo(ub->engine_type)->max_speed != 0) - max_speed_b = min(max_speed_b, RailVehInfo(ub->engine_type)->max_speed); - } while ((ub = ub->Next()) != NULL); - - r = max_speed_a - max_speed_b; + r = va->u.rail.cached_max_speed - vb->u.rail.cached_max_speed; } else { r = va->max_speed - vb->max_speed; }