From d0299e4c162ff08a896c7da027bc1c069fe5e73a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 11 Apr 2023 23:59:14 +0100 Subject: [PATCH] Revert "Fix #9870: Don't update infrastructure totals when overbuilding object on canal" This reverts commit 37d318c41098f128924e1fa3369492594a9ce6c3. Use 0a31b27a209f71a2a71b3fab740fb39253b3f2c4 instead. --- src/water_cmd.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 36f8a19918..9960243ce1 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -537,14 +537,11 @@ CommandCost CmdBuildCanal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 FALLTHROUGH; default: - /* If we overbuild a water object with a canal, don't update the infrastructure total. */ - bool is_existing_canal = IsTileType(current_tile, MP_WATER) && IsCanal(current_tile); - if (Company::IsValidID(_current_company) && !is_existing_canal) { + MakeCanal(current_tile, _current_company, Random()); + if (Company::IsValidID(_current_company)) { Company::Get(_current_company)->infrastructure.water++; DirtyCompanyInfrastructureWindows(_current_company); } - - MakeCanal(current_tile, _current_company, Random()); break; } MarkTileDirtyByTile(current_tile);