(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp
index 93062b5c2..b48257e46 100644
--- a/src/yapf/yapf_costrail.hpp
+++ b/src/yapf/yapf_costrail.hpp
@@ -195,7 +195,7 @@ public:
 		Trackdir trackdir = n.m_key.m_td;
 		TileType tile_type = GetTileType(tile);
 
-		RailType rail_type = GetTileRailType(tile, trackdir);
+		RailType rail_type = GetTileRailType(tile, TrackdirToTrack(trackdir));
 
 		bool target_seen = Yapf().PfDetectDestination(tile, trackdir);
 
@@ -252,7 +252,7 @@ public:
 
 			// if tail type changes, finish segment (cached segment can't contain more rail types)
 			{
-				RailType new_rail_type = GetTileRailType(F.m_new_tile, (Trackdir)FindFirstBit2x64(F.m_new_td_bits));
+				RailType new_rail_type = GetTileRailType(F.m_new_tile, TrackdirToTrack(FindFirstTrackdir(F.m_new_td_bits)));
 				if (new_rail_type != rail_type) {
 					break;
 				}