Mercurial > hg > openttd
changeset 2843:bbc15daeb0c2 draft
(svn r3391) - PBS Fix: Keep PBS reservation state when building a bridge over rail.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Sun, 08 Jan 2006 12:44:11 +0000 |
parents | fa76710b941c |
children | d72f60a73332 |
files | tunnelbridge_cmd.c |
diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -204,6 +204,7 @@ uint i; int32 cost, terraformcost, ret; bool allow_on_slopes; + bool reserved = false; SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); @@ -351,6 +352,7 @@ if (ti.map5 != 1) goto not_valid_below; } m5 = 0xE0; + reserved = PBSTileReserved(ti.tile) != 0; } else if (ti.type == MP_STREET) { if (direction == 0) { if (ti.map5 != 5) goto not_valid_below; @@ -400,6 +402,16 @@ _m[ti.tile].m2 = (bridge_type << 4) | m5; SB(_m[ti.tile].m3, 4, 4, railtype); + if (ti.type == MP_RAILWAY) { + // Set or clear PBS reservation status. direction here is of + // the bridge, not the track below. + if (reserved) { + PBSReserveTrack(ti.tile, direction ? TRACK_DIAG1 : TRACK_DIAG2); + } else { + PBSClearTrack(ti.tile, direction ? TRACK_DIAG1 : TRACK_DIAG2); + } + } + MarkTileDirtyByTile(ti.tile); } }