Mercurial > hg > openttd
changeset 3524:ab8dc818d880 draft
(svn r4380) -Codechange: Make use of GetTrackBits where appropriate
author | celestar <celestar@openttd.org> |
---|---|
date | Wed, 12 Apr 2006 12:12:51 +0000 |
parents | ca4aa6c713e9 |
children | 35d7f7574479 |
files | rail_cmd.c |
diffstat | 1 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/rail_cmd.c +++ b/rail_cmd.c @@ -1781,11 +1781,12 @@ (rail & TRACK_BIT_X) )) { TileIndex n = tile + TileDiffXY(0, -1); + TrackBits nrail = GetTrackBits(n); if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_UPPER || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LEFT) { + nrail == TRACK_BIT_UPPER || + nrail == TRACK_BIT_LEFT) { new_ground = RAIL_GROUND_FENCE_NW; } } @@ -1795,11 +1796,12 @@ (rail & TRACK_BIT_X) )) { TileIndex n = tile + TileDiffXY(0, 1); + TrackBits nrail = GetTrackBits(n); if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LOWER || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_RIGHT) { + nrail == TRACK_BIT_LOWER || + nrail == TRACK_BIT_RIGHT) { new_ground = (new_ground == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE; } @@ -1810,11 +1812,12 @@ (rail & TRACK_BIT_Y) )) { TileIndex n = tile + TileDiffXY(-1, 0); + TrackBits nrail = GetTrackBits(n); if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_UPPER || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_RIGHT) { + nrail == TRACK_BIT_UPPER || + nrail == TRACK_BIT_RIGHT) { new_ground = RAIL_GROUND_FENCE_NE; } } @@ -1824,11 +1827,12 @@ (rail & TRACK_BIT_Y) )) { TileIndex n = tile + TileDiffXY(1, 0); + TrackBits nrail = GetTrackBits(n); if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LOWER || - (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LEFT) { + nrail == TRACK_BIT_LOWER || + nrail == TRACK_BIT_LEFT) { new_ground = (new_ground == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW; }