--- a/rail_cmd.c	Wed Mar 29 19:37:18 2006 +0000
+++ b/rail_cmd.c	Wed Mar 29 20:06:31 2006 +0000
@@ -1300,7 +1300,7 @@
 		if (track & TRACK_BIT_RIGHT) DrawGroundSprite(rti->base_sprites.single_e);
 	}
 
-	if (GB(_m[ti->tile].m3, 0, 4) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
+	if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 
 }
 
@@ -1519,7 +1519,7 @@
 			}
 
 			// remember if this block has a presignal.
-			ssd->has_presignal |= (_m[tile].m4&1);
+			ssd->has_presignal |= (_m[tile].m4 & 1);
 		}
 
 		if (HasSignalOnTrackdir(tile, track) && _m[tile].m4 & 2) {