diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-13 15:15:02 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-13 15:15:02 +0000 |
| commit | 6892cc8a60df5ea34dc882eaa19d00fbdfa0a87d (patch) | |
| tree | dac29ea6e8a497476ccca38533bf4a47e52948f6 /src/landscape.cpp | |
| parent | b20e77be921acc32b5887f9f35ecae8573c588af (diff) | |
| download | openttd-6892cc8a60df5ea34dc882eaa19d00fbdfa0a87d.tar.xz | |
(svn r21500) -Feature [FS#730]: diagonal tile clearing and terraforming. Based on patch by fonsinchen
Diffstat (limited to 'src/landscape.cpp')
| -rw-r--r-- | src/landscape.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/landscape.cpp b/src/landscape.cpp index dec03a09a..18b8343a3 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -642,7 +642,8 @@ CommandCost CmdLandscapeClear(TileIndex tile, DoCommandFlag flags, uint32 p1, ui * @param tile end tile of area dragging * @param flags of operation to conduct * @param p1 start tile of area dragging - * @param p2 unused + * @param p2 various bitstuffed data. + * bit 0: Whether to use the Orthogonal (0) or Diagonal (1) iterator. * @param text unused * @return the cost of this operation or an error */ @@ -656,7 +657,9 @@ CommandCost CmdClearArea(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 bool had_success = false; TileArea ta(tile, p1); - TILE_AREA_LOOP(t, ta) { + TileIterator *iter = HasBit(p2, 0) ? (TileIterator *)new DiagonalTileIterator(tile, p1) : new OrthogonalTileIterator(ta); + for (; *iter != INVALID_TILE; ++(*iter)) { + TileIndex t = *iter; CommandCost ret = DoCommand(t, 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR); if (ret.Failed()) { last_error = ret; @@ -668,6 +671,7 @@ CommandCost CmdClearArea(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 money -= ret.GetCost(); if (ret.GetCost() > 0 && money < 0) { _additional_cash_required = ret.GetCost(); + delete iter; return cost; } DoCommand(t, 0, 0, flags, CMD_LANDSCAPE_CLEAR); @@ -684,6 +688,7 @@ CommandCost CmdClearArea(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 cost.AddCost(ret); } + delete iter; return had_success ? cost : last_error; } |