From 7020a48ea024caf53c1d715ef88e16bf50940e24 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 22 Aug 2008 22:28:26 +0000 Subject: [PATCH] (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) --- src/train_cmd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 950cdd5a6e..0dfa2189ec 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1887,7 +1887,12 @@ static void ReverseTrainDirection(Vehicle *v) 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. */