mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-20 21:19:10 +00:00
Code Issues Activity

Codechange: Iterate with VehiclesOnTile when moving free wagons to the new vehicle

Browse Source
This commit is contained in:
SamuXarick
2025-05-18 17:54:09 +01:00
parent 1b0fd0e6fd
commit cf38e410ce
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/train_cmd.cpp
View File

@@ -692,12 +692,19 @@ static CommandCost CmdBuildRailWagon(DoCommandFlags flags, TileIndex tile, const
void NormalizeTrainVehInDepot(const Train *u)
{
assert(u->IsEngine());
for (const Train *v : Train::Iterate()) {
if (v->IsFreeWagon() && v->tile == u->tile &&
v->track == TRACK_BIT_DEPOT) {
if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, v->index, u->index, true).Failed()) {
break;
}
std::vector<VehicleID> freewagons;
for (const Vehicle *w : VehiclesOnTile(u->tile)) {
if (w->type != VEH_TRAIN) continue;
const Train *v = Train::From(w);
if (v->IsFreeWagon() && v->track == TRACK_BIT_DEPOT) {
freewagons.push_back(v->index);
}
}
std::ranges::sort(freewagons);
for (VehicleID veh_id : freewagons) {
if (Command<CMD_MOVE_RAIL_VEHICLE>::Do(DoCommandFlag::Execute, veh_id, u->index, true).Failed()) {
break;
}
}
}