--- a/road_cmd.c	Thu Mar 30 00:48:45 2006 +0000
+++ b/road_cmd.c	Thu Mar 30 09:08:43 2006 +0000
@@ -787,7 +787,7 @@
 			}
 
 			DrawGroundSprite(image);
-			if (GB(_m[ti->tile].m4, 0, 4) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
+			if (GetRailTypeCrossing(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 			break;
 		}
 
@@ -1014,9 +1014,9 @@
 						0 : _road_trackbits[GetRoadBits(tile)] * 0x101;
 
 				case ROAD_CROSSING: {
-					uint32 r = (GetCrossingRoadAxis(tile) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101;
+					uint32 r = GetCrossingRailBits(tile) * 0x101;
 
-					if (_m[tile].m5 & 4) r *= 0x10001;
+					if (IsCrossingBarred(tile)) r *= 0x10001;
 					return r;
 				}