Mercurial > hg > openttd
changeset 2841:03a4b5997078 draft
(svn r3389) -Fix: No fence was placed when placing fences and the neighbouring tile is a rail configuration which permits a fence but has a signal
(Per request of peter1138 the above line does not contain any commas)
author | tron <tron@openttd.org> |
---|---|
date | Sat, 07 Jan 2006 17:26:37 +0000 |
parents | c0370aa7fd8b |
children | fa76710b941c |
files | rail_cmd.c |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/rail_cmd.c +++ b/rail_cmd.c @@ -1996,8 +1996,8 @@ if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - _m[n].m5 == TRACK_BIT_UPPER || - _m[n].m5 == TRACK_BIT_LEFT) { + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_UPPER || + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LEFT) { new_ground = RAIL_GROUND_FENCE_NW; } } @@ -2010,8 +2010,8 @@ if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - _m[n].m5 == TRACK_BIT_LOWER || - _m[n].m5 == TRACK_BIT_RIGHT) { + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LOWER || + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_RIGHT) { new_ground = (new_ground == RAIL_GROUND_FENCE_NW) ? RAIL_GROUND_FENCE_SENW : RAIL_GROUND_FENCE_SE; } @@ -2025,8 +2025,8 @@ if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - _m[n].m5 == TRACK_BIT_UPPER || - _m[n].m5 == TRACK_BIT_RIGHT) { + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_UPPER || + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_RIGHT) { new_ground = RAIL_GROUND_FENCE_NE; } } @@ -2039,8 +2039,8 @@ if (!IsTileType(n, MP_RAILWAY) || !IsTileOwner(n, owner) || - _m[n].m5 == TRACK_BIT_LOWER || - _m[n].m5 == TRACK_BIT_LEFT) { + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LOWER || + (_m[n].m5 & TRACK_BIT_MASK) == TRACK_BIT_LEFT) { new_ground = (new_ground == RAIL_GROUND_FENCE_NE) ? RAIL_GROUND_FENCE_NESW : RAIL_GROUND_FENCE_SW; }