From 5910bde58367764387e00c76e14d7465be942e7f Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 12 Dec 2010 11:41:15 +0000 Subject: (svn r21476) -Fix [FS#4299]: DC_FORCE_CLEAR_TILE should only add extra cost for clearing water for stuff which results in water after clearing. --- src/landscape.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/landscape.cpp') diff --git a/src/landscape.cpp b/src/landscape.cpp index cbf2815c4..a0ffb0cfd 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -609,7 +609,8 @@ CommandCost CmdLandscapeClear(TileIndex tile, DoCommandFlag flags, uint32 p1, ui { CommandCost cost(EXPENSES_CONSTRUCTION); bool do_clear = false; - if ((flags & DC_FORCE_CLEAR_TILE) && HasTileWaterClass(tile) && IsTileOnWater(tile)) { + /* Test for stuff which results in water when cleared. Then add the cost to also clear the water. */ + if ((flags & DC_FORCE_CLEAR_TILE) && HasTileWaterClass(tile) && IsTileOnWater(tile) && !IsWaterTile(tile) && !IsCoastTile(tile)) { if ((flags & DC_AUTO) && GetWaterClass(tile) == WATER_CLASS_CANAL) return_cmd_error(STR_ERROR_MUST_DEMOLISH_CANAL_FIRST); do_clear = true; cost.AddCost(GetWaterClass(tile) == WATER_CLASS_CANAL ? _price[PR_CLEAR_CANAL] : _price[PR_CLEAR_WATER]); -- cgit v1.2.3-54-g00ecf