From 3626eb340e5996a9a9e1fa84c9b4023ecc55c952 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 15 Feb 2010 23:55:04 +0000 Subject: (svn r19141) -Fix [FS#3619] (r18421): look-ahead for multitile waypoints 'made up' data that shouldn't go into the cache, causing desyncs in MP --- src/pathfinder/yapf/yapf_costrail.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/pathfinder/yapf/yapf_costrail.hpp') diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp index 57820af1e..6c4603c68 100644 --- a/src/pathfinder/yapf/yapf_costrail.hpp +++ b/src/pathfinder/yapf/yapf_costrail.hpp @@ -410,7 +410,9 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th end_segment_reason |= ESRB_DEPOT; } else if (cur.tile_type == MP_STATION && IsRailWaypoint(cur.tile)) { - if (v->current_order.IsType(OT_GOTO_WAYPOINT) && GetStationIndex(cur.tile) == v->current_order.GetDestination()) { + if (v->current_order.IsType(OT_GOTO_WAYPOINT) && + GetStationIndex(cur.tile) == v->current_order.GetDestination() && + !Waypoint::Get(v->current_order.GetDestination())->IsSingleTile()) { /* This waypoint is our destination; maybe this isn't an unreserved * one, so check that and if so see that as the last signal being * red. This way waypoints near stations should work better. */ -- cgit v1.2.3-54-g00ecf