Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Inconsistent error message when overbuilding canal on a lock/ship depot tile #9410

Merged
merged 2 commits into from Sep 18, 2021
Merged

Fix: Inconsistent error message when overbuilding canal on a lock/ship depot tile #9410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c002d
Fix: reduce cost of building canals over objects on sea
SamuXarick Sep 18, 2021
4c37d36
Fix: wrong error message when building canals over ship depots / locks
SamuXarick Sep 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/water_cmd.cpp
View file
Open in desktop
Expand Up @@ -475,11 +475,12 @@ CommandCost CmdBuildCanal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED);
}

bool water = IsWaterTile(current_tile);

/* can't make water of water! */
if (IsTileType(current_tile, MP_WATER) && (!IsTileOwner(current_tile, OWNER_WATER) || wc == WATER_CLASS_SEA)) continue;
if (water && (!IsTileOwner(current_tile, OWNER_WATER) || wc == WATER_CLASS_SEA)) continue;
TrueBrain marked this conversation as resolved.
Show resolved Hide resolved

bool water = IsWaterTile(current_tile);
ret = DoCommand(current_tile, 0, 0, flags | DC_FORCE_CLEAR_TILE, CMD_LANDSCAPE_CLEAR);
ret = DoCommand(current_tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (ret.Failed()) return ret;

if (!water) cost.AddCost(ret);
Expand Down