From be88e269b918b365695e84cfa962e8d21b98e759 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 7 Jun 2006 19:35:21 +0000 Subject: (svn r5155) - Remove the bridge branch merge (revision r5070) --- ai/default/default.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ai') diff --git a/ai/default/default.c b/ai/default/default.c index c71b0b1cd..dd682581c 100644 --- a/ai/default/default.c +++ b/ai/default/default.c @@ -2165,7 +2165,9 @@ static bool AiRemoveTileAndGoForward(Player *p) return false; p->ai.cur_tile_a = TILE_MASK(_build_tunnel_endtile - TileOffsByDir(p->ai.cur_dir_a)); return true; - } else { + } + + if (IsBridgeRamp(tile)) { // 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; @@ -3697,6 +3699,7 @@ pos_3: } else if (IsTileType(tile, MP_TUNNELBRIDGE)) { if (!IsTileOwner(tile, _current_player) || !IsBridge(tile) || + !IsBridgeRamp(tile) || GetBridgeTransportType(tile) != TRANSPORT_RAIL) { return; } -- cgit v1.2.3-54-g00ecf