--- a/rail_cmd.c	Wed Mar 08 23:21:32 2006 +0000
+++ b/rail_cmd.c	Thu Mar 09 12:32:25 2006 +0000
@@ -1756,11 +1756,10 @@
 }
 
 
-bool UpdateSignalsOnSegment(TileIndex tile, Direction dir)
+bool UpdateSignalsOnSegment(TileIndex tile, DiagDirection direction)
 {
 	SetSignalsData ssd;
 	int result = -1;
-	DiagDirection direction = DirToDiagDir(dir);
 
 	ssd.cur_stack = 0;
 
@@ -1788,8 +1787,12 @@
 
 void SetSignalsOnBothDir(TileIndex tile, byte track)
 {
-	static const Direction _search_dir_1[] = { DIR_NE, DIR_SE, DIR_NE, DIR_SE, DIR_SW, DIR_SE };
-	static const Direction _search_dir_2[] = { DIR_SW, DIR_NW, DIR_NW, DIR_SW, DIR_NW, DIR_NE };
+	static const DiagDirection _search_dir_1[] = {
+		DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_SE
+	};
+	static const DiagDirection _search_dir_2[] = {
+		DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE
+	};
 
 	UpdateSignalsOnSegment(tile, _search_dir_1[track]);
 	UpdateSignalsOnSegment(tile, _search_dir_2[track]);

--- a/train_cmd.c	Wed Mar 08 23:21:32 2006 +0000
+++ b/train_cmd.c	Thu Mar 09 12:32:25 2006 +0000
@@ -1964,7 +1964,7 @@
 
 		v->load_unload_time_rem = 0;
 
-		if (UpdateSignalsOnSegment(v->tile, v->direction)) {
+		if (UpdateSignalsOnSegment(v->tile, DirToDiagDir(v->direction))) {
 			InvalidateWindowClasses(WC_TRAINS_LIST);
 			return true;
 		}
@@ -1983,7 +1983,7 @@
 	UpdateTrainDeltaXY(v, v->direction);
 	v->cur_image = GetTrainImage(v, v->direction);
 	VehiclePositionChanged(v);
-	UpdateSignalsOnSegment(v->tile, v->direction);
+	UpdateSignalsOnSegment(v->tile, DirToDiagDir(v->direction));
 	UpdateTrainAcceleration(v);
 	InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 
@@ -2623,9 +2623,9 @@
 	}
 }
 
-static const Direction _otherside_signal_directions[] = {
-	DIR_NE, DIR_SE, DIR_NE, DIR_SE, DIR_SW, DIR_SE, 0, 0,
-	DIR_SW, DIR_NW, DIR_NW, DIR_SW, DIR_NW, DIR_NE,
+static const DiagDirection _otherside_signal_directions[] = {
+	DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_SW, DIAGDIR_SE, 0, 0,
+	DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NW, DIAGDIR_NE
 };
 
 static void TrainMovedChangeSignals(TileIndex tile, DiagDirection dir)

--- a/tunnelbridge_cmd.c	Wed Mar 08 23:21:32 2006 +0000
+++ b/tunnelbridge_cmd.c	Thu Mar 09 12:32:25 2006 +0000
@@ -506,7 +506,7 @@
 			MakeRoadTunnel(end_tile,   _current_player, ReverseDiagDir(direction));
 		}
 
-		if (GB(p1, 9, 1) == 0) UpdateSignalsOnSegment(start_tile, DiagDirToDir(direction));
+		if (GB(p1, 9, 1) == 0) UpdateSignalsOnSegment(start_tile, direction);
 	}
 
 	return cost;
@@ -582,8 +582,8 @@
 
 		DoClearSquare(tile);
 		DoClearSquare(endtile);
-		UpdateSignalsOnSegment(tile, DiagDirToDir(ReverseDiagDir(dir)));
-		UpdateSignalsOnSegment(endtile, DiagDirToDir(dir));
+		UpdateSignalsOnSegment(tile, ReverseDiagDir(dir));
+		UpdateSignalsOnSegment(endtile, dir);
 	}
 	return _price.clear_tunnel * (length + 1);
 }

--- a/vehicle.h	Wed Mar 08 23:21:32 2006 +0000
+++ b/vehicle.h	Thu Mar 09 12:32:25 2006 +0000
@@ -284,7 +284,7 @@
 Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z);
 TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v);
 
-bool UpdateSignalsOnSegment(TileIndex tile, Direction direction);
+bool UpdateSignalsOnSegment(TileIndex tile, DiagDirection direction);
 void SetSignalsOnBothDir(TileIndex tile, byte track);
 
 Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y);