(svn r5083) -Fix: Assert when trying to build a lock on a tile with trees. (Thanks anboni for reporting)

18 years ago · d7261da206
parent 8c01bf711d
commit d7261da206
1 changed files with 5 additions and 1 deletions
--- a/water_cmd.c
+++ b/water_cmd.c
@ -141,7 +141,11 @@ static int32 DoBuildShiplift(TileIndex tile, DiagDirection dir, uint32 flags)
 		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);