cpp/openttd-patchpack/source Changeset - r16772:c9de70d3970c

Changeset - r16772:c9de70d3970c

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

terkhen - 13 years ago 2010-12-14 21:24:51
terkhen@openttd.org

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

2 files changed with 2 insertions and 10 deletions:

src/ai/api/ai_vehicle.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_vehicle.cpp

➞

Show inline comments

@@ @@ -46,19 +46,13 @@ @@
 /* static */ int AIVehicle::GetLength(VehicleID vehicle_id)
+{
 	if (!IsValidVehicle(vehicle_id)) return -1;
 	const Vehicle *v = ::Vehicle::Get(vehicle_id);
 	switch (v->type) {
 		case VEH_ROAD: {
 			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_ROAD:  return ::RoadVehicle::From(v)->rcache.cached_total_length;
 		case VEH_TRAIN: return ::Train::From(v)->tcache.cached_total_length;
 		default: return -1;
+	}
+}
 /* static */ VehicleID AIVehicle::BuildVehicle(TileIndex depot, EngineID engine_id)

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -851,15 +851,13 @@ static int CDECL VehicleLengthSorter(con @@
 	switch ((*a)->type) {
 		case VEH_TRAIN:
 			r = Train::From(*a)->tcache.cached_total_length - Train::From(*b)->tcache.cached_total_length;
 			break;
 		case VEH_ROAD: {
 			const RoadVehicle *u;
 			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;
 			r = RoadVehicle::From(*a)->rcache.cached_total_length - RoadVehicle::From(*b)->rcache.cached_total_length;
 			break;
+		}
 		default: NOT_REACHED();
+	}
 	return (r != 0) ? r : VehicleNumberSorter(a, b);

0 comments (0 inline, 0 general)