mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r4967) -Fix: [clone vehicles] a cloned train engine heads the same way as the original (pointed out by bobingabout)
[autoreplace] the same applies to autoreplaced trains if the engine is a single unit (not dualheaded or articulated)
This commit is contained in:
parent
08092832e4
commit
4557832c9c
|
@ -1550,6 +1550,9 @@ int32 CmdCloneVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||||
DoCommand(0, w->index, v->cargo_type, flags, CMD_REFIT_VEH(v->type));
|
DoCommand(0, w->index, v->cargo_type, flags, CMD_REFIT_VEH(v->type));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (v->type == VEH_Train && HASBIT(v->u.rail.flags, VRF_REVERSE_DIRECTION)) {
|
||||||
|
SETBIT(w->u.rail.flags, VRF_REVERSE_DIRECTION);
|
||||||
|
}
|
||||||
|
|
||||||
if (v->type == VEH_Train && !IsFrontEngine(v)) {
|
if (v->type == VEH_Train && !IsFrontEngine(v)) {
|
||||||
// this s a train car
|
// this s a train car
|
||||||
|
@ -1641,7 +1644,10 @@ static int32 ReplaceVehicle(Vehicle **w, byte flags)
|
||||||
if (!CmdFailed(temp_cost)) cost += temp_cost;
|
if (!CmdFailed(temp_cost)) cost += temp_cost;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (new_v->type == VEH_Train && HASBIT(old_v->u.rail.flags, VRF_REVERSE_DIRECTION) && !IsMultiheaded(new_v) && !(new_v->next != NULL && IsArticulatedPart(new_v->next))) {
|
||||||
|
// we are autorenewing to a single engine, so we will turn it as the old one was turned as well
|
||||||
|
SETBIT(new_v->u.rail.flags, VRF_REVERSE_DIRECTION);
|
||||||
|
}
|
||||||
|
|
||||||
if (old_v->type == VEH_Train && !IsFrontEngine(old_v)) {
|
if (old_v->type == VEH_Train && !IsFrontEngine(old_v)) {
|
||||||
/* this is a railcar. We need to move the car into the train
|
/* this is a railcar. We need to move the car into the train
|
||||||
|
|
Loading…
Reference in New Issue