--- a/npf.c	Tue Sep 05 23:43:42 2006 +0000
+++ b/npf.c	Wed Sep 06 01:56:01 2006 +0000
@@ -563,16 +563,16 @@
 				 * outside of the depot. But, because the code layout is cleaner this
 				 * way, we will just pretend we are reversed already */
 				src_trackdir = ReverseTrackdir(src_trackdir);
-				dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDir(exitdir));
+				dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDiagDir(exitdir));
 			} else {
 				dst_tile = INVALID_TILE; /* Road vehicle heading inwards: dead end */
 			}
 		} else {
-			dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDir(exitdir));
+			dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDiagDir(exitdir));
 		}
 	} else {
 		/* This a normal tile, a bridge, a tunnel exit, etc. */
-		dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDir(TrackdirToExitdir(src_trackdir)));
+		dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDiagDir(TrackdirToExitdir(src_trackdir)));
 	}
 	if (dst_tile == INVALID_TILE) {
 		/* We reached the border of the map */