From a2b03e54e04303fc1f5a613c56ee5f48d0505ae8 Mon Sep 17 00:00:00 2001 From: terkhen Date: Sun, 25 Apr 2010 13:52:08 +0000 Subject: [PATCH] (svn r19719) -Codechange: When building a lock, do not add the cost of building canals if they are already built. --- src/water_cmd.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index e877618eb8..d1d02d0ba2 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -213,6 +213,7 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag ret = DoCommand(tile - delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (ret.Failed()) return ret; cost.AddCost(ret); + cost.AddCost(_price[PR_CLEAR_WATER]); } if (GetTileSlope(tile - delta, NULL) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); @@ -225,6 +226,7 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag ret = DoCommand(tile + delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR); if (ret.Failed()) return ret; cost.AddCost(ret); + cost.AddCost(_price[PR_CLEAR_WATER]); } if (GetTileSlope(tile + delta, NULL) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); @@ -244,7 +246,7 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag MarkCanalsAndRiversAroundDirty(tile - delta); MarkCanalsAndRiversAroundDirty(tile + delta); } - cost.AddCost(_price[PR_CLEAR_WATER] * 22 >> 3); + cost.AddCost(_price[PR_CLEAR_WATER] * 3 / 4); return cost; }