From 734994c9ba642f5c75b709d4b44e0c4b993a949a Mon Sep 17 00:00:00 2001 From: terkhen Date: Sat, 29 Jan 2011 17:30:25 +0000 Subject: (svn r21924) -Codechange: Unify some parts of the articulated vehicle code. -Cleanup: Avoid conversions to Train and RoadVehicle that are no longer required. --- src/articulated_vehicles.cpp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'src/articulated_vehicles.cpp') diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 824611ddc..ae6b9d5e6 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -221,19 +221,7 @@ bool IsArticulatedVehicleCarryingDifferentCargos(const Vehicle *v, CargoID *carg } } - switch (v->type) { - case VEH_TRAIN: - v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticulatedPart() : NULL; - break; - - case VEH_ROAD: - v = RoadVehicle::From(v)->HasArticulatedPart() ? v->Next() : NULL; - break; - - default: - v = NULL; - break; - } + v = v->HasArticulatedPart() ? v->GetNextArticulatedPart() : NULL; } while (v != NULL); if (cargo_type != NULL) *cargo_type = first_cargo; @@ -268,19 +256,7 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v) assert(v->cargo_type < NUM_CARGO); real_default_capacity[v->cargo_type] += v->cargo_cap; - switch (v->type) { - case VEH_TRAIN: - v = Train::From(v)->HasArticulatedPart() ? Train::From(v)->GetNextArticulatedPart() : NULL; - break; - - case VEH_ROAD: - v = RoadVehicle::From(v)->HasArticulatedPart() ? v->Next() : NULL; - break; - - default: - v = NULL; - break; - } + v = v->HasArticulatedPart() ? v->GetNextArticulatedPart() : NULL; } while (v != NULL); /* Check whether the vehicle carries more cargos than expected */ -- cgit v1.2.3-54-g00ecf