Mercurial > hg > openttd
changeset 8582:48e1d4898d72 draft
(svn r12163) -Fix [FS#1705]: if a train is 'stopping' when entering a depot, do not let it leave again
author | smatz <smatz@openttd.org> |
---|---|
date | Sat, 16 Feb 2008 22:29:30 +0000 |
parents | 0060507052b9 |
children | 6843e1063801 |
files | src/vehicle.cpp |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -613,8 +613,10 @@ */ void VehicleEnteredDepotThisTick(Vehicle *v) { - /* we need to set v->leave_depot_instantly as we have no control of it's contents at this time */ - if (HasBit(v->current_order.flags, OF_HALT_IN_DEPOT) && !HasBit(v->current_order.flags, OF_PART_OF_ORDERS) && v->current_order.type == OT_GOTO_DEPOT) { + /* We need to set v->leave_depot_instantly as we have no control of it's contents at this time. + * Vehicle should stop in the depot if it was in 'stopping' state - train intered depot while slowing down. */ + if ((HasBit(v->current_order.flags, OF_HALT_IN_DEPOT) && !HasBit(v->current_order.flags, OF_PART_OF_ORDERS) && v->current_order.type == OT_GOTO_DEPOT) || + (v->vehstatus & VS_STOPPED)) { /* we keep the vehicle in the depot since the user ordered it to stay */ v->leave_depot_instantly = false; } else {