diff options
| author | belugas <belugas@openttd.org> | 2006-03-29 20:35:39 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2006-03-29 20:35:39 +0000 |
| commit | 1cadf4ea53066bd35a6820188bdbe7f298215a50 (patch) | |
| tree | cbd20c9d993f25ca819014dfae322c97081707d5 | |
| parent | 9b3f9d3c791c142076f5ca5e39199cedaf5b1334 (diff) | |
| download | openttd-1cadf4ea53066bd35a6820188bdbe7f298215a50.tar.xz | |
(svn r4157) CodeChange : Keep on cleaning up Celestar's elrail merge
| -rw-r--r-- | os_timer.c | 2 | ||||
| -rw-r--r-- | road_cmd.c | 2 | ||||
| -rw-r--r-- | station_cmd.c | 2 | ||||
| -rw-r--r-- | tunnelbridge_cmd.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/os_timer.c b/os_timer.c index 210a43ab7..2c40f5bfd 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 20505c959..35701fae8 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 1cbad1c0d..95b0f7dab 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 7445db167..75cf7473f 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); |