Mercurial > hg > openttd
changeset 8383:c7f63c6ca884 draft
(svn r11952) -Fix (r11926): Prevent industries from being built on rivers, unless they require water.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Tue, 22 Jan 2008 22:17:28 +0000 |
parents | 2828c536cd0d |
children | 30198447a5e7 |
files | src/industry_cmd.cpp src/water_map.h |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1226,7 +1226,7 @@ IndustryBehaviour 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->slopes_refused, 5) && ((IsWaterTile(cur_tile) || IsRiverTile(cur_tile)) == !(ind_behav & INDUSTRYBEH_BUILT_ONWATER))) return false; if (HasBit(its->callback_flags, CBM_INDT_SHAPE_CHECK)) { custom_shape = true;
--- a/src/water_map.h +++ b/src/water_map.h @@ -72,6 +72,11 @@ return IsTileType(t, MP_WATER) && IsWater(t); } +static inline bool IsRiverTile(TileIndex t) +{ + return IsTileType(t, MP_WATER) && IsRiver(t); +} + static inline TileIndex GetOtherShipDepotTile(TileIndex t) { return t + (HasBit(_m[t].m5, 0) ? -1 : 1) * (HasBit(_m[t].m5, 1) ? TileDiffXY(0, 1) : TileDiffXY(1, 0));