--- a/train_cmd.c	Wed Mar 08 08:16:31 2006 +0000
+++ b/train_cmd.c	Wed Mar 08 08:28:48 2006 +0000
@@ -2172,7 +2172,7 @@
 
 	assert(v->u.rail.track);
 
-	i = _search_directions[FIND_FIRST_BIT(v->u.rail.track)][v->direction>>1];
+	i = _search_directions[FIND_FIRST_BIT(v->u.rail.track)][DirToDiagDir(v->direction)];
 
 	if (_patches.new_pathfinding_all) { /* Use a new pathfinding for everything */
 		NPFFindStationOrTileData fstd;