Merge branch 'tracerestrict-sx' into jgrpp

Conflicts: src/saveload/extended_ver_sl.cpp
2015-09-02 21:09:25 +01:00
parent de270a2702 c751bba17c
commit 3dec3242cc
11 changed files with 228 additions and 36 deletions
--- a/src/pathfinder/yapf/yapf_rail.cpp
+++ b/src/pathfinder/yapf/yapf_rail.cpp
@@ -97,7 +97,7 @@ private:
 				m_res_fail_td = td;
 			}
 		} else {
-			if (!TryReserveRailTrack(tile, TrackdirToTrack(td))) {
+			if (!TryReserveRailTrackdir(tile, td)) {
 				/* Tile couldn't be reserved, undo. */
 				m_res_fail_tile = tile;
 				m_res_fail_td = td;