# HG changeset patch
# User rubidium
# Date 1188565588 0
# Node ID e64b04e6f3b117398a27679fbe667628c59bfcd9
# Parent  7b5d83a10725c5639041fd9d9f33e522f292e228
(svn r11015) -Fix [FS#1166]: towns would build bridges through eachother.

diff -r 7b5d83a10725 -r e64b04e6f3b1 src/town_cmd.cpp
--- a/src/town_cmd.cpp	Fri Aug 31 12:57:52 2007 +0000
+++ b/src/town_cmd.cpp	Fri Aug 31 13:06:28 2007 +0000
@@ -1084,19 +1084,17 @@
 
 	/* Quit if it selecting an appropiate bridge type fails a large number of times. */
 	j = 22;
-	{
-		int32 bridge_len = GetBridgeLength(tile, tmptile);
-		do {
-			byte bridge_type = RandomRange(MAX_BRIDGES - 1);
-			if (CheckBridge_Stuff(bridge_type, bridge_len)) {
-				if (CmdSucceeded(DoCommand(tile, tmptile, bridge_type | ((0x80 | ROADTYPES_ROAD) << 8), DC_EXEC | DC_AUTO, CMD_BUILD_BRIDGE)))
-					_grow_town_result = -1;
-
-				/* obviously, if building any bridge would fail, there is no need to try other bridge-types */
-				return;
-			}
-		} while (--j != 0);
-	}
+	do {
+		byte bridge_type = RandomRange(MAX_BRIDGES - 1);
+		/* Can we actually build the bridge? */
+		if (CmdSucceeded(DoCommand(tile, tmptile, bridge_type | ((0x80 | ROADTYPES_ROAD) << 8), DC_AUTO, CMD_BUILD_BRIDGE))) {
+			DoCommand(tile, tmptile, bridge_type | ((0x80 | ROADTYPES_ROAD) << 8), DC_EXEC | DC_AUTO, CMD_BUILD_BRIDGE);
+				_grow_town_result = -1;
+
+			/* obviously, if building any bridge would fail, there is no need to try other bridge-types */
+			return;
+		}
+	} while (--j != 0);
 }
 
 /** Returns "growth" if a house was built, or no if the build failed.