diff options
| -rw-r--r-- | src/landscape.cpp | 22 | ||||
| -rw-r--r-- | src/object_base.h | 1 | ||||
| -rw-r--r-- | src/object_cmd.cpp | 17 |
3 files changed, 29 insertions, 11 deletions
diff --git a/src/landscape.cpp b/src/landscape.cpp index 71a788c25..cbf2815c4 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -614,22 +614,22 @@ CommandCost CmdLandscapeClear(TileIndex tile, DoCommandFlag flags, uint32 p1, ui do_clear = true; cost.AddCost(GetWaterClass(tile) == WATER_CLASS_CANAL ? _price[PR_CLEAR_CANAL] : _price[PR_CLEAR_WATER]); } - for (uint i = 0; i < _cleared_object_areas.Length(); i++) { - /* If this tile was the first tile which caused object destruction, always - * pass it on to the tile_type_proc. That way multiple test runs and the exec run stay consistent. */ - if (_cleared_object_areas[i].first_tile == tile) break; + const ClearedObjectArea *coa = FindClearedObject(tile); + + /* If this tile was the first tile which caused object destruction, always + * pass it on to the tile_type_proc. That way multiple test runs and the exec run stay consistent. */ + if (coa != NULL && coa->first_tile != tile) { /* If this tile belongs to an object which was already cleared via another tile, pretend it has been * already removed. * However, we need to check stuff, which is not the same for all object tiles. (e.g. being on water or not) */ - if (_cleared_object_areas[i].area.Intersects(TileArea(tile, 1, 1))) { - /* If a object is removed, it leaves either bare land or water. */ - if ((flags & DC_NO_WATER) && HasTileWaterClass(tile) && IsTileOnWater(tile)) { - return_cmd_error(STR_ERROR_CAN_T_BUILD_ON_WATER); - } - if (do_clear && (flags & DC_EXEC)) DoClearSquare(tile); - return cost; + + /* If a object is removed, it leaves either bare land or water. */ + if ((flags & DC_NO_WATER) && HasTileWaterClass(tile) && IsTileOnWater(tile)) { + return_cmd_error(STR_ERROR_CAN_T_BUILD_ON_WATER); } + if (do_clear && (flags & DC_EXEC)) DoClearSquare(tile); + return cost; } cost.AddCost(_tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags)); if (do_clear && (flags & DC_EXEC)) DoClearSquare(tile); diff --git a/src/object_base.h b/src/object_base.h index 3ca3da111..4220a0c4c 100644 --- a/src/object_base.h +++ b/src/object_base.h @@ -95,6 +95,7 @@ struct ClearedObjectArea { TileArea area; ///< The area of the object. }; +ClearedObjectArea *FindClearedObject(TileIndex tile); extern SmallVector<ClearedObjectArea, 4> _cleared_object_areas; #endif /* OBJECT_BASE_H */ diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 0cf87a50e..a3af4eb59 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -371,6 +371,23 @@ static void ReallyClearObjectTile(Object *o) SmallVector<ClearedObjectArea, 4> _cleared_object_areas; +/** + * Find the entry in _cleared_object_areas which occupies a certain tile. + * @param tile Tile of interest + * @return Occupying entry, or NULL if none + */ +ClearedObjectArea *FindClearedObject(TileIndex tile) +{ + TileArea ta = TileArea(tile, 1, 1); + + const ClearedObjectArea *end = _cleared_object_areas.End(); + for (ClearedObjectArea *coa = _cleared_object_areas.Begin(); coa != end; coa++) { + if (coa->area.Intersects(ta)) return coa; + } + + return NULL; +} + static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags) { ObjectType type = GetObjectType(tile); |