dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/timetable_cmd.cpp
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2022-07-30 20:38:34 +01:00
parent c6817fab6e ccb9d99880
commit 71b6d7a502
23 changed files with 247 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehiclelist.cpp
View File

@@ -82,21 +82,21 @@ void BuildDepotVehicleList(VehicleType type, TileIndex tile, VehicleList *engine
case VEH_TRAIN: {
const Train *t = Train::From(v);
if (t->IsArticulatedPart() || t->IsRearDualheaded()) continue;
if (t->track != TRACK_BIT_DEPOT) continue;
if (!t->IsInDepot()) continue;
if (wagons != nullptr && t->First()->IsFreeWagon()) {
if (individual_wagons || t->IsFreeWagon()) wagons->push_back(t);
continue;
}
if (!t->IsPrimaryVehicle()) continue;
break;
}
default:
if (!v->IsPrimaryVehicle()) continue;
if (!v->IsInDepot()) continue;
break;
}
if (!v->IsPrimaryVehicle()) continue;
engines->push_back(v);
}