diff options
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 12ea3ddaf..c47c23dae 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1063,7 +1063,15 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p Vehicle *src_previous = src->Previous(); while (next_to_attach != NULL) { + /* Back up and clear the first_engine data to avoid using wagon override group */ + EngineID first_engine = next_to_attach->u.rail.first_engine; + next_to_attach->u.rail.first_engine = INVALID_ENGINE; + uint16 callback = GetVehicleCallbackParent(CBID_TRAIN_ALLOW_WAGON_ATTACH, 0, 0, dst_head->engine_type, next_to_attach, dst_head); + + /* Restore original first_engine data */ + next_to_attach->u.rail.first_engine = first_engine; + if (callback != CALLBACK_FAILED) { StringID error = STR_NULL; @@ -1088,6 +1096,9 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p } } + /* Only check further wagons if told to move the chain */ + if (!HasBit(p2, 0)) break; + /* * Adding a next wagon to the chain so we can test the other wagons. * First 'take' the first wagon from 'next_to_attach' and move it |