From 383d8713cb3616c2141f09db2debf54cce8284a9 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 20 Dec 2008 00:16:23 +0000 Subject: (svn r14699) -Fix (r14483): Do not use v->dest_tile for trains heading to a station. Reaching that tile does not mean reaching the station. --- src/train_cmd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/train_cmd.cpp') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 3e81cd842..80ead8107 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2936,7 +2936,10 @@ static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir * for a path and no look-ahead is necessary. This also avoids a * problem with depot orders not part of the order list when the * order list itself is empty. */ - if (!v->current_order.IsType(OT_GOTO_DEPOT) && (v->tile == v->dest_tile || (v->current_order.IsType(OT_GOTO_STATION) && IsRailwayStationTile(v->tile) && v->current_order.GetDestination() == GetStationIndex(v->tile)))) { + if (!v->current_order.IsType(OT_GOTO_DEPOT) && ( + v->current_order.IsType(OT_GOTO_STATION) ? + IsRailwayStationTile(v->tile) && v->current_order.GetDestination() == GetStationIndex(v->tile) : + v->tile == v->dest_tile)) { orders.SwitchToNextOrder(); } -- cgit v1.2.3-70-g09d2