summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-09-05 16:00:04 +0000
committeryexo <yexo@openttd.org>2010-09-05 16:00:04 +0000
commit323c526a4d344025b3ba30ade5923c0d41431d8c (patch)
tree6483d3608d9770c61edbdbfd4776297c0a4e81a3
parenta9cdcb02f56d6d77bb55d31a2806f763fd137f1c (diff)
downloadopenttd-323c526a4d344025b3ba30ade5923c0d41431d8c.tar.xz
(svn r20747) -Fix: overbuilding an object with water under it succeeded even for industries that can't be build on water
-rw-r--r--src/industry_cmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index fcd6fafca..c9852472c 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1337,7 +1337,7 @@ static CommandCost CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTil
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_cmd_error(STR_ERROR_SITE_UNSUITABLE);
+ if (!HasBit(its->slopes_refused, 5) && ((HasTileWaterClass(cur_tile) && IsTileOnWater(cur_tile)) == !(ind_behav & INDUSTRYBEH_BUILT_ONWATER))) return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
if (HasBit(its->callback_mask, CBM_INDT_SHAPE_CHECK)) {
custom_shape = true;