--- a/pathfind.c	Wed Jun 28 05:56:09 2006 +0000
+++ b/pathfind.c	Wed Jun 28 06:10:20 2006 +0000
@@ -756,7 +756,7 @@
 
 				/* Check the rail type only if the train is *NOT* on top of a bridge. */
 				if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) {
-					if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) {
+					if (!HASBIT(tpf->railtypes, IsTileType(tile, MP_STREET) ? GetRailTypeCrossing(tile) : GetRailType(tile))) {
 						bits = 0;
 						break;
 					}

--- a/rail_cmd.c	Wed Jun 28 05:56:09 2006 +0000
+++ b/rail_cmd.c	Wed Jun 28 06:10:20 2006 +0000
@@ -1205,7 +1205,7 @@
  * @param snow Draw as snow
  * @param flat Always draw foundation
  */
-static void DrawTrackBits(TileInfo* ti, TrackBits track, bool flat)
+static void DrawTrackBits(TileInfo* ti, TrackBits track)
 {
 	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
 	PalSpriteID image;
@@ -1233,13 +1233,7 @@
 	(image++, true);
 
 	if (ti->tileh != SLOPE_FLAT) {
-		int foundation;
-
-		if (flat) {
-			foundation = ti->tileh;
-		} else {
-			foundation = GetRailFoundation(ti->tileh, track);
-		}
+		uint foundation = GetRailFoundation(ti->tileh, track);
 
 		if (foundation != 0) DrawFoundation(ti, foundation);
 
@@ -1313,7 +1307,7 @@
 	if (GetRailTileType(ti->tile) != RAIL_TILE_DEPOT_WAYPOINT) {
 		TrackBits rails = GetTrackBits(ti->tile);
 
-		DrawTrackBits(ti, rails, false);
+		DrawTrackBits(ti, rails);
 
 		if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti);
 

--- a/road_cmd.c	Wed Jun 28 05:56:09 2006 +0000
+++ b/road_cmd.c	Wed Jun 28 06:10:20 2006 +0000
@@ -696,8 +696,9 @@
  * @param ti TileInfo
  * @param road RoadBits to draw
  */
-static void DrawRoadBits(TileInfo* ti, RoadBits road)
+static void DrawRoadBits(TileInfo* ti)
 {
+	RoadBits road = GetRoadBits(ti->tile);
 	const DrawRoadTileStruct *drts;
 	PalSpriteID image = 0;
 	Roadside roadside;
@@ -752,7 +753,7 @@
 {
 	switch (GetRoadTileType(ti->tile)) {
 		case ROAD_TILE_NORMAL:
-			DrawRoadBits(ti, GetRoadBits(ti->tile));
+			DrawRoadBits(ti);
 			break;
 
 		case ROAD_TILE_CROSSING: {