From 3633d5692327bc1cb86437fccdcdd906fa0ceb1b Mon Sep 17 00:00:00 2001
From: belugas <belugas@openttd.org>
Date: Wed, 29 Mar 2006 20:35:39 +0000
Subject: [PATCH] (svn r4157) CodeChange : Keep on cleaning up Celestar's
 elrail merge

---
 os_timer.c         | 2 +-
 road_cmd.c         | 2 +-
 station_cmd.c      | 2 +-
 tunnelbridge_cmd.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/os_timer.c b/os_timer.c
index 210a43ab7f..2c40f5bfd0 100644
--- a/os_timer.c
+++ b/os_timer.c
@@ -8,7 +8,7 @@
 # if defined (_M_AMD64)
 extern uint64 _rdtsc(void);
 #	else
-uint64 _declspec(naked) _rdtsc(void) 
+uint64 _declspec(naked) _rdtsc(void)
 {
 	_asm {
 		rdtsc
diff --git a/road_cmd.c b/road_cmd.c
index 20505c9591..35701fae83 100644
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -787,7 +787,7 @@ static void DrawTile_Road(TileInfo *ti)
 			}
 
 			DrawGroundSprite(image);
-			if (GB(_m[ti->tile].m4, 0, 4) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
+			if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 			break;
 		}
 
diff --git a/station_cmd.c b/station_cmd.c
index 1cbad1c0d1..95b0f7dab4 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -1959,7 +1959,7 @@ static void DrawTile_Station(TileInfo *ti)
 	// but this is something else. If AI builds station with 114 it looks all weird
 	DrawGroundSprite(image);
 
-	if (GB(_m[ti->tile].m3, 0, 4) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
+	if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 
 	foreach_draw_tile_seq(dtss, t->seq) {
 		image = dtss->image + relocation;
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 7445db1673..75cf7473f0 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -974,7 +974,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
 				DrawGroundSprite(SPR_FLAT_SNOWY_TILE + _tileh_to_sprite[ti->tileh]);
 			}
 
-			if (GB(_m[ti->tile].m3, 0, 3) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
+			if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 
 			// draw ramp
 			if (_display_opt & DO_TRANS_BUILDINGS) MAKE_TRANSPARENT(image);