Mercurial > hg > openttd
changeset 3939:092e19a5110e draft
(svn r5083) -Fix: Assert when trying to build a lock on a tile with trees. (Thanks anboni for reporting)
| author | celestar <celestar@openttd.org> |
|---|---|
| date | Sat, 03 Jun 2006 12:53:29 +0000 |
| parents | 0a5c6a4776ca |
| children | 7f38159bcb1d |
| files | water_cmd.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);