Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21515) -Codechange: Use cached_total_length where appropiate.

Browse Source
This commit is contained in:
terkhen 2010-12-14 21:24:51 +00:00
parent 91df711d61
commit 96b98b392a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/api/ai_vehicle.cpp
View File

@ -49,13 +49,7 @@
const Vehicle *v = ::Vehicle::Get(vehicle_id); const Vehicle *v = ::Vehicle::Get(vehicle_id);
switch (v->type) { switch (v->type) {
case VEH_ROAD: { case VEH_ROAD: return ::RoadVehicle::From(v)->rcache.cached_total_length;
uint total_length = 0;
for (const Vehicle *u = v; u != NULL; u = u->Next()) {
total_length += ::RoadVehicle::From(u)->rcache.cached_veh_length;
}
return total_length;
}
case VEH_TRAIN: return ::Train::From(v)->tcache.cached_total_length; case VEH_TRAIN: return ::Train::From(v)->tcache.cached_total_length;
default: return -1; default: return -1;
} }

4
src/vehicle_gui.cpp
View File

@ -854,9 +854,7 @@ static int CDECL VehicleLengthSorter(const Vehicle * const *a, const Vehicle * c
break; break;
case VEH_ROAD: { case VEH_ROAD: {
const RoadVehicle *u; r = RoadVehicle::From(*a)->rcache.cached_total_length - RoadVehicle::From(*b)->rcache.cached_total_length;
for (u = RoadVehicle::From(*a); u != NULL; u = u->Next()) r += u->rcache.cached_veh_length;
for (u = RoadVehicle::From(*b); u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length;
break; break;
} }