mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Preserve orders and related settings where possible when moving engines around in a train.

pull/10802/head
Michael Lutz 2023-05-09 22:27:45 +02:00
parent 07449be876
commit 7e906c7c59
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/train_cmd.cpp
View File

@ -1322,8 +1322,14 @@ CommandCost CmdMoveRailVehicle(DoCommandFlag flags, VehicleID src_veh, VehicleID
DeleteNewGRFInspectWindow(GSF_TRAINS, src->index); DeleteNewGRFInspectWindow(GSF_TRAINS, src->index);
SetWindowDirty(WC_COMPANY, _current_company); SetWindowDirty(WC_COMPANY, _current_company);
/* Delete orders, group stuff and the unit number as we're not the if (src_head != nullptr && src_head->IsFrontEngine()) {
* front of any vehicle anymore. */ /* Cases #?b: Transfer order, unit number and other stuff
* to the new front engine. */
src_head->orders = src->orders;
if (src_head->orders != nullptr) src_head->AddToShared(src);
src_head->CopyVehicleConfigAndStatistics(src);
}
/* Remove stuff not valid anymore for non-front engines. */
DeleteVehicleOrders(src); DeleteVehicleOrders(src);
src->unitnumber = 0; src->unitnumber = 0;
} }