Fix #9264: Do not attach temporary wagons to free wagon chains when autoreplacing

This commit is contained in:
Jonathan G Rennison 2021-05-15 22:32:50 +01:00 committed by rubidium42
parent 33d99d27f4
commit a896753ecc

View File

@ -1178,7 +1178,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
/* if nothing is selected as destination, try and find a matching vehicle to drag to. */ /* if nothing is selected as destination, try and find a matching vehicle to drag to. */
Train *dst; Train *dst;
if (d == INVALID_VEHICLE) { if (d == INVALID_VEHICLE) {
dst = src->IsEngine() ? nullptr : FindGoodVehiclePos(src); dst = (src->IsEngine() || (flags & DC_AUTOREPLACE)) ? nullptr : FindGoodVehiclePos(src);
} else { } else {
dst = Train::GetIfValid(d); dst = Train::GetIfValid(d);
if (dst == nullptr) return CMD_ERROR; if (dst == nullptr) return CMD_ERROR;