From 38d60f4b47a5bc6dac0a3207f4fee7f895d5b6b9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 11 May 2010 11:55:12 +0000 Subject: [PATCH] (svn r19784) -Fix [FS#3770]: if a waypoint is immediately followed by a path signal a reservation would be made from that path signal before the waypoint is marked passed. As a result the order to go to the waypoint is used to reserve the path after the waypoint and as such trains get lost --- src/train_cmd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index f1260f7ff1..a4fd35d80f 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2122,6 +2122,8 @@ static void CheckNextTrainTile(Train *v) if ((v->tile == v->dest_tile && v->current_order.IsType(OT_GOTO_DEPOT)) || v->track == TRACK_BIT_DEPOT) return; /* Exit if we are on a station tile and are going to stop. */ if (IsRailStationTile(v->tile) && v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile))) return; + /* If we reached our waypoint, make sure we see that. */ + if (v->current_order.IsType(OT_GOTO_WAYPOINT) && IsRailWaypointTile(v->tile) && GetStationIndex(v->tile) == v->current_order.GetDestination()) ProcessOrders(v); /* Exit if the current order doesn't have a destination, but the train has orders. */ if ((v->current_order.IsType(OT_NOTHING) || v->current_order.IsType(OT_LEAVESTATION) || v->current_order.IsType(OT_LOADING)) && v->GetNumOrders() > 0) return;