diff options
| author | Michael Lutz <michi@icosahedron.de> | 2021-10-30 01:31:46 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2021-12-16 22:28:32 +0100 |
| commit | e740c24eb7a90bc771f5976d64d80639ee7576e5 (patch) | |
| tree | b3c8f0c87419cb11c106ba1cb58d6ae0648beef4 /src/terraform_cmd.cpp | |
| parent | c88b104ec662ea80bec89f58aa7ad9d0baac7704 (diff) | |
| download | openttd-e740c24eb7a90bc771f5976d64d80639ee7576e5.tar.xz | |
Codechange: Template DoCommand to automagically reflect the parameters of the command proc.
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
Diffstat (limited to 'src/terraform_cmd.cpp')
| -rw-r--r-- | src/terraform_cmd.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp index 17da36ecc..df178e3ab 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -18,6 +18,7 @@ #include "company_func.h" #include "core/backup_type.hpp" #include "terraform_cmd.h" +#include "landscape_cmd.h" #include "table/strings.h" @@ -290,7 +291,7 @@ CommandCost CmdTerraformLand(DoCommandFlag flags, TileIndex tile, uint32 p1, uin } CommandCost cost; if (indirectly_cleared) { - cost = DoCommand(tile_flags, CMD_LANDSCAPE_CLEAR, t, 0, 0); + cost = Command<CMD_LANDSCAPE_CLEAR>::Do(tile_flags, t, 0, 0, {}); } else { cost = _tile_type_procs[GetTileType(t)]->terraform_tile_proc(t, tile_flags, z_min, tileh); } @@ -379,7 +380,7 @@ CommandCost CmdLevelLand(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 TileIndex t = *iter; uint curh = TileHeight(t); while (curh != h) { - CommandCost ret = DoCommand(flags & ~DC_EXEC, CMD_TERRAFORM_LAND, t, SLOPE_N, (curh > h) ? 0 : 1); + CommandCost ret = Command<CMD_TERRAFORM_LAND>::Do(flags & ~DC_EXEC, t, SLOPE_N, (curh > h) ? 0 : 1, {}); if (ret.Failed()) { last_error = ret; @@ -395,7 +396,7 @@ CommandCost CmdLevelLand(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 delete iter; return cost; } - DoCommand(flags, CMD_TERRAFORM_LAND, t, SLOPE_N, (curh > h) ? 0 : 1); + Command<CMD_TERRAFORM_LAND>::Do(flags, t, SLOPE_N, (curh > h) ? 0 : 1, {}); } else { /* When we're at the terraform limit we better bail (unneeded) testing as well. * This will probably cause the terraforming cost to be underestimated, but only |