Merge branch 'tracerestrict-sx' into jgrpp

2016-07-18 00:48:12 +01:00
parent e7dfc40a59 8482fc6aef
commit 3ea652c4b9
3 changed files with 24 additions and 12 deletions
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.hpp
@@ -221,10 +221,14 @@ private:
 				TileIndex tile = v->tile;
 				Trackdir  trackdir = v->GetVehicleTrackdir();

-				CFollowTrackRail ft(v);
-
 				TileIndex candidate_tile = INVALID_TILE;

+				if (IsRailDepotTile(v->tile)) {
+					candidate_tile = v->tile;
+				}
+
+				CFollowTrackRail ft(v);
+
 				for (;;) {
 					if (IsTileType(tile, MP_RAILWAY) && HasSignalOnTrackdir(tile, trackdir)) {
 						if (HasPbsSignalOnTrackdir(tile, trackdir)) {