dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r20729) -Fix [FS#4107]: assert when overbuilding object

Browse Source
This commit is contained in:
yexo
2010-09-03 21:50:51 +00:00
parent bd379e283f
commit a45b598bfc
5 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/landscape.cpp
View File

@@ -29,6 +29,7 @@
#include "landscape_type.h"
#include "animated_tile_func.h"
#include "core/random_func.hpp"
#include "object_base.h"
#include "table/sprites.h"
@@ -603,6 +604,9 @@ void ClearSnowLine()
*/
CommandCost CmdLandscapeClear(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
for (uint i = 0; i < _cleared_object_areas.Length(); i++) {
if (_cleared_object_areas[i].Intersects(TileArea(tile, 1, 1))) return CommandCost();
}
return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags);
}
@@ -634,7 +638,9 @@ CommandCost CmdClearArea(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
for (int x = sx; x <= ex; ++x) {
for (int y = sy; y <= ey; ++y) {
SmallVector<TileArea, 1> object_areas = _cleared_object_areas;
CommandCost ret = DoCommand(TileXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
_cleared_object_areas = object_areas;
if (ret.Failed()) {
last_error = ret;
continue;