diff options
author | celestar <celestar@openttd.org> | 2006-12-27 12:38:02 +0000 |
---|---|---|
committer | celestar <celestar@openttd.org> | 2006-12-27 12:38:02 +0000 |
commit | d95e2c2dd10a0dfc1704962a68a2bd32b635d158 (patch) | |
tree | 28100daed109de06e979123edd0601487ecc8261 /ai | |
parent | d92103d6ff97ae413e2e6eae602e04b05addaf17 (diff) | |
download | openttd-d95e2c2dd10a0dfc1704962a68a2bd32b635d158.tar.xz |
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
Diffstat (limited to 'ai')
-rw-r--r-- | ai/default/default.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ai/default/default.c b/ai/default/default.c index f21a9174a..0f69322b0 100644 --- a/ai/default/default.c +++ b/ai/default/default.c @@ -2183,9 +2183,7 @@ static bool AiRemoveTileAndGoForward(Player *p) return false; p->ai.cur_tile_a = TILE_MASK(_build_tunnel_endtile - TileOffsByDiagDir(p->ai.cur_dir_a)); return true; - } - - if (IsBridgeRamp(tile)) { + } else { // Check if the bridge points in the right direction. // This is not really needed the first place AiRemoveTileAndGoForward is called. if (DiagDirToAxis(GetBridgeRampDirection(tile)) != (p->ai.cur_dir_a & 1U)) return false; @@ -3704,7 +3702,6 @@ pos_3: } else if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (!IsTileOwner(tile, _current_player) || !IsBridge(tile) || - !IsBridgeRamp(tile) || GetBridgeTransportType(tile) != TRANSPORT_RAIL) { return; } |