(svn r16718) -Codechange: make IsFreeWagon() member of Train

This commit is contained in:
smatz
2009-07-01 23:49:13 +00:00
parent 20fedeb3d6
commit 378d01f2f4
8 changed files with 24 additions and 17 deletions

View File

@@ -27,14 +27,16 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine
if (v->tile != tile) continue;
switch (type) {
case VEH_TRAIN:
if (IsArticulatedPart(v) || IsRearDualheaded(v)) continue;
if (Train::From(v)->track != TRACK_BIT_DEPOT) continue;
if (wagons != NULL && IsFreeWagon(v->First())) {
if (individual_wagons || IsFreeWagon(v)) *wagons->Append() = v;
case VEH_TRAIN: {
const Train *t = Train::From(v);
if (IsArticulatedPart(t) || IsRearDualheaded(t)) continue;
if (t->track != TRACK_BIT_DEPOT) continue;
if (wagons != NULL && t->First()->IsFreeWagon()) {
if (individual_wagons || t->IsFreeWagon()) *wagons->Append() = t;
continue;
}
break;
}
default:
if (!v->IsInDepot()) continue;