cpp/openttd-patchpack/source File Diff

File diff r12108:f8d8164485bd → r12109:90df01928018

src/articulated_vehicles.cpp

➞

Show inline comments

@@ @@ -205,13 +205,13 @@ bool IsArticulatedVehicleCarryingDiffere @@
 				return true;
+			}
+		}
 		switch (v->type) {
 			case VEH_TRAIN:
-				v = (EngineHasArticPart((const Train *)v) ? GetNextArticPart((const Train *)v) : NULL);
+				v = (EngineHasArticPart(Train::From(v)) ? GetNextArticPart(Train::From(v)) : NULL);
 				break;
 			case VEH_ROAD:
 				v = (RoadVehHasArticPart(v) ? v->Next() : NULL);
 				break;
@@ @@ -253,13 +253,13 @@ void CheckConsistencyOfArticulatedVehicl @@
 		assert(v->cargo_type < NUM_CARGO);
 		real_default_capacity[v->cargo_type] += v->cargo_cap;
 		switch (v->type) {
 			case VEH_TRAIN:
-				v = (EngineHasArticPart((const Train *)v) ? GetNextArticPart((const Train *)v) : NULL);
+				v = (EngineHasArticPart(Train::From(v)) ? GetNextArticPart(Train::From(v)) : NULL);
 				break;
 			case VEH_ROAD:
 				v = (RoadVehHasArticPart(v) ? v->Next() : NULL);
 				break;
@@ @@ -302,13 +302,13 @@ void AddArticulatedParts(Vehicle *first, @@
 		const Engine *e_artic = Engine::Get(engine_type);
 		switch (type) {
 			default: NOT_REACHED();
 			case VEH_TRAIN: {
-				Train *front = (Train *)first;
+				Train *front = Train::From(first);
 				Train *t = new Train();
 				v->SetNext(t);
 				v = t;
 				t->subtype = 0;
 				t->track = front->track;
@@ @@ -325,13 +325,13 @@ void AddArticulatedParts(Vehicle *first, @@
+				}
 				SetArticulatedPart(t);
 			} break;
 			case VEH_ROAD: {
-				RoadVehicle *front = (RoadVehicle *)first;
+				RoadVehicle *front = RoadVehicle::From(first);
 				RoadVehicle *rv = new RoadVehicle();
 				v->SetNext(rv);
 				v = rv;
 				rv->subtype = 0;
 				rv->rcache.first_engine = front->engine_type;