summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-01-08 12:44:11 +0000
committerpeter1138 <peter1138@openttd.org>2006-01-08 12:44:11 +0000
commit7ae5e344a2cd973ae449a7b9162bfb458186386a (patch)
tree8315bec70feea97a6d65d94daf2e7697ecb01c92
parent8958c8b7b155499a9049d1e9300fc5021f4ad5d1 (diff)
downloadopenttd-7ae5e344a2cd973ae449a7b9162bfb458186386a.tar.xz
(svn r3391) - PBS Fix: Keep PBS reservation state when building a bridge over rail.
-rw-r--r--tunnelbridge_cmd.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 88d9d2d2e..3964ab4e1 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -204,6 +204,7 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2)
uint i;
int32 cost, terraformcost, ret;
bool allow_on_slopes;
+ bool reserved = false;
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
@@ -351,6 +352,7 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2)
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 @@ not_valid_below:;
_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);
}
}