dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3391) - PBS Fix: Keep PBS reservation state when building a bridge over rail.

Browse Source
This commit is contained in:
peter1138
2006-01-08 12:44:11 +00:00
parent 4bf1741783
commit 019e794234
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tunnelbridge_cmd.c
View File

@@ -204,6 +204,7 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2)
uint i; uint i;
int32 cost, terraformcost, ret; int32 cost, terraformcost, ret;
bool allow_on_slopes; bool allow_on_slopes;
bool reserved = false;
SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); 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; if (ti.map5 != 1) goto not_valid_below;
} }
m5 = 0xE0; m5 = 0xE0;
reserved = PBSTileReserved(ti.tile) != 0;
} else if (ti.type == MP_STREET) { } else if (ti.type == MP_STREET) {
if (direction == 0) { if (direction == 0) {
if (ti.map5 != 5) goto not_valid_below; if (ti.map5 != 5) goto not_valid_below;
@@ -400,6 +402,16 @@ not_valid_below:;
_m[ti.tile].m2 = (bridge_type << 4) | m5; _m[ti.tile].m2 = (bridge_type << 4) | m5;
SB(_m[ti.tile].m3, 4, 4, railtype); 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); MarkTileDirtyByTile(ti.tile);
} }
} }