# HG changeset patch
# User celestar <celestar@openttd.org>
# Date 1149339209 0
# Node ID 092e19a5110ec1a14615cd2ebf7b0b75e4f9020d
# Parent  0a5c6a4776ca7b4467ab637b991f0923ec3e71cc
(svn r5083) -Fix: Assert when trying to build a lock on a tile with trees. (Thanks anboni for reporting)

diff --git a/water_cmd.c b/water_cmd.c
--- a/water_cmd.c
+++ b/water_cmd.c
@@ -141,7 +141,11 @@
 		return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
 	}
 
-	if (IsBridgeAbove(tile) || IsBridgeAbove(tile - delta) || IsBridgeAbove(tile + delta)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
+	if ((MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) ||
+	    (MayHaveBridgeAbove(tile - delta) && IsBridgeAbove(tile - delta)) ||
+	    (MayHaveBridgeAbove(tile + delta) && IsBridgeAbove(tile + delta))) {
+		return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
+	}
 
 	if (flags & DC_EXEC) {
 		MakeLock(tile, dir);