# HG changeset patch # User frosch # Date 1219444106 0 # Node ID ed2e764e5d6b4ecd96df3a3bf35bfb36b967287c # Parent e50a5bff98bc115cd0ad32d3bd5ef21cfe94c0ea (svn r14130) -Fix (r13961) [FS#2248]: Clear the stuck state of a train that is reversing with the first vehicle inside a depot. (michi_cc) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1887,7 +1887,12 @@ if (crossing != INVALID_TILE) MaybeBarCrossingWithSound(crossing); /* If we are inside a depot after reversing, don't bother with path reserving. */ - if (v->u.rail.track & TRACK_BIT_DEPOT) return; + if (v->u.rail.track & TRACK_BIT_DEPOT) { + /* Can't be stuck here as inside a depot is always a safe tile. */ + if (HasBit(v->u.rail.flags, VRF_TRAIN_STUCK)) InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); + ClrBit(v->u.rail.flags, VRF_TRAIN_STUCK); + return; + } /* TrainExitDir does not always produce the desired dir for depots and * tunnels/bridges that is needed for UpdateSignalsOnSegment. */