Mercurial > hg > openttd
changeset 7756:46a1943852c7 draft
(svn r11301) -Fix: water check when building industries didn't work
author | glx <glx@openttd.org> |
---|---|
date | Fri, 19 Oct 2007 21:05:25 +0000 |
parents | 2ee2ce82e2d6 |
children | 47c2afb5b9ff |
files | src/industry_cmd.cpp |
diffstat | 1 files changed, 5 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1228,24 +1228,15 @@ IndustyBehaviour ind_behav = GetIndustrySpec(type)->behaviour; + /* Perform land/water check if not disabled */ + if (!HASBIT(its->slopes_refused, 5) && (IsWaterTile(cur_tile) == !(ind_behav & INDUSTRYBEH_BUILT_ONWATER))) return false; + if (HASBIT(its->callback_flags, CBM_INDT_SHAPE_CHECK)) { custom_shape = true; if (!PerformIndustryTileSlopeCheck(tile, cur_tile, its, type, gfx, itspec_index)) return false; } else { - if (ind_behav & INDUSTRYBEH_BUILT_ONWATER) { - /* As soon as the tile is not water, bail out. - * But that does not mean the search is over. You have - * to make sure every tile of the industry will be only water*/ - if (!IsWaterTile(cur_tile)) return false; - } else { - Slope tileh; - - if (IsWaterTile(cur_tile)) return false; - - tileh = GetTileSlope(cur_tile, NULL); - - refused_slope |= IsSlopeRefused(tileh, its->slopes_refused); - } + Slope tileh = GetTileSlope(cur_tile, NULL); + refused_slope |= IsSlopeRefused(tileh, its->slopes_refused); } if (ind_behav & INDUSTRYBEH_ONLY_INTOWN) {