Mercurial > hg > openttd

changeset 16070:5b02c499468e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20763) -Fix [FS#4113](r20749): The bridgetest on building shipdepots can no longer rely on being only called for clear water tiles.
author frosch <frosch@openttd.org>
date Tue, 07 Sep 2010 19:20:15 +0000
parents f73b2f554830
children 69830f1ac3b6
files src/water_cmd.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -104,7 +104,8 @@
 		return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER);
 	}
 
-	if (IsBridgeAbove(tile) || IsBridgeAbove(tile2)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
+	if ((MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) ||
+		(MayHaveBridgeAbove(tile2) && IsBridgeAbove(tile2))) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
 
 	if (GetTileSlope(tile, NULL) != SLOPE_FLAT || GetTileSlope(tile2, NULL) != SLOPE_FLAT) {
 		/* Prevent depots on rapids */