mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-09 15:41:15 +00:00
(svn r9832) -Fix: leave the station when manually skipping to the next order and we are currently (un)loading.
This commit is contained in:
parent
d78651f7b1
commit
e72ab0fdf5
@ -583,10 +583,12 @@ int32 CmdSkipOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
|||||||
|
|
||||||
if (v->type == VEH_ROAD) ClearSlot(v);
|
if (v->type == VEH_ROAD) ClearSlot(v);
|
||||||
|
|
||||||
|
if (v->current_order.type == OT_LOADING) {
|
||||||
|
v->LeaveStation();
|
||||||
/* NON-stop flag is misused to see if a train is in a station that is
|
/* NON-stop flag is misused to see if a train is in a station that is
|
||||||
* on his order list or not */
|
* on his order list or not */
|
||||||
if (v->current_order.type == OT_LOADING && HASBIT(v->current_order.flags, OFB_NON_STOP))
|
if (HASBIT(v->current_order.flags, OFB_NON_STOP)) v->current_order.flags = 0;
|
||||||
v->current_order.flags = 0;
|
}
|
||||||
|
|
||||||
InvalidateVehicleOrder(v);
|
InvalidateVehicleOrder(v);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user